path: root/git.c
diff options
authorJohannes Schindelin <>2019-07-29 20:08:16 (GMT)
committerJunio C Hamano <>2019-07-29 21:51:43 (GMT)
commitb91408400757d021b10876c36280ef891b502420 (patch)
tree6b4ea0abb3d5b266b65d06bfc2f9efe67bcf0382 /git.c
parent3a94cb31d52f061c315b00bfc005f1b1c42ac92d (diff)
git: avoid calling aliased builtins via their dashed form
This is one of the few places where Git violates its own deprecation of the dashed form. It is not necessary, either. As of 595d59e2b53 (git.c: ignore pager.* when launching builtin as dashed external, 2017-08-02), Git wants to ignore the pager.* config setting when expanding aliases. So let's strip out the check_pager_config(<command-name>) call from the copy-edited code. This code actually made it into upstream git.git already, but it was disabled in `#if 0 ... #endif` guards so far. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'git.c')
1 files changed, 0 insertions, 3 deletions
diff --git a/git.c b/git.c
index f4c0478..3049dae 100644
--- a/git.c
+++ b/git.c
@@ -743,8 +743,6 @@ static int run_argv(int *argcp, const char ***argv)
if (!done_alias)
handle_builtin(*argcp, *argv);
-#if 0 // TODO In GFW, need to amend a7924b655e940b06cb547c235d6bed9767929673 to include trace2_ and _tr2 lines.
else if (get_builtin(**argv)) {
struct argv_array args = ARGV_ARRAY_INIT;
int i;
@@ -779,7 +777,6 @@ static int run_argv(int *argcp, const char ***argv)
die("could not execute builtin %s", **argv);
-#endif // a7924b655e940b06cb547c235d6bed9767929673
/* .. then try the external ones */