summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2017-08-02 19:40:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-03 18:08:11 (GMT)
commit595d59e2b53a19f8c5c277348e4e1a07bb913ba4 (patch)
tree7d2ec5731d65cc698c51c84c8c05e6d2d9fca0ce /git.c
parentff1e72483f416ecb58737205163031f54c24e754 (diff)
downloadgit-595d59e2b53a19f8c5c277348e4e1a07bb913ba4.zip
git-595d59e2b53a19f8c5c277348e4e1a07bb913ba4.tar.gz
git-595d59e2b53a19f8c5c277348e4e1a07bb913ba4.tar.bz2
git.c: ignore pager.* when launching builtin as dashed external
When running, e.g., `git -c alias.bar=foo bar`, we expand the alias and execute `git-foo` as a dashed external. This is true even if git foo is a builtin. That is on purpose, and is motivated in a comment which was added in commit 441981bc ("git: simplify environment save/restore logic", 2016-01-26). Shortly before we launch a dashed external, and unless we have already found out whether we should use a pager, we check `pager.foo`. This was added in commit 92058e4d ("support pager.* for external commands", 2011-08-18). If the dashed external is a builtin, this does not match that commit's intention and is arguably wrong, since it would be cleaner if we let the "dashed external builtin" handle `pager.foo`. This has not mattered in practice, but a recent patch taught `git-tag` to ignore `pager.tag` under certain circumstances. But, when started using an alias, it doesn't get the chance to do so, as outlined above. That recent patch added a test to document this breakage. Do not check `pager.foo` before launching a builtin as a dashed external, i.e., if we recognize the name of the external as a builtin. Change the test to use `test_expect_success`. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/git.c b/git.c
index 82ac2a0..6b6d9f6 100644
--- a/git.c
+++ b/git.c
@@ -559,7 +559,7 @@ static void execv_dashed_external(const char **argv)
if (get_super_prefix())
die("%s doesn't support --super-prefix", argv[0]);
- if (use_pager == -1)
+ if (use_pager == -1 && !is_builtin(argv[0]))
use_pager = check_pager_config(argv[0]);
commit_pager_choice();