core.pager handling broken

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

core.pager handling broken

From: Brian Gernhardt <hidden>
Date: 2016-06-15 22:43:27

I don't have time to look into it, but something broke the core.pager  
variable.  I've bisected it down to  
"e90fdc39b6903502192b2dd11e5503cea721a1ad: Clean up work-tree  
handling".  With this commit:

$ git config core.pager
tig
$ git log
# Uses less
$ GIT_PAGER=tig git log
# Uses tig

I don't have time to track it down right now (I'm off visiting  
family), but will look into it tomorrow unless someone thinks it's  
obvious and points it out before then.

~~ Brian

[PATCH] check_repository_format_version(): run git_default_config() again

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:43:27

I broke this in "e90fdc39: Clean up work-tree handling".  It is
needed, for example for interpreting core.pager before starting the
pager.

Noticed by Brian Gernhardt.

Signed-off-by: Johannes Schindelin <redacted>
---

	My first commit with git-gui!  Yeah!

	On Mon, 6 Aug 2007, Brian Gernhardt wrote:

	> I don't have time to look into it, but something broke the 
	> core.pager variable.  I've bisected it down to 
	> "e90fdc39b6903502192b2dd11e5503cea721a1ad: Clean up work-tree 
	> handling".

	Thanks.

 setup.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/setup.c b/setup.c
index 4945eb3..35fa031 100644
--- a/setup.c
+++ b/setup.c
@@ -355,7 +355,8 @@ int check_repository_format_version(const char *var, const char *value)
 			free(git_work_tree_cfg);
 		git_work_tree_cfg = xstrdup(value);
 		inside_work_tree = -1;
-	}
+	} else
+		return git_default_config(var, value);
 	return 0;
 }
 
-- 
1.5.3.rc4.17.gb980
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help