Merge branch 'mt/parallel-checkout-part-2'

[thirdparty/git.git] / git.c

diff --git a/git.c b/git.c
index 532b5b4136befefd45363c5d587b4f949fb0688d..06d681cd593989df91b906ec06896cd6f2daf544 100644 (file)
--- a/git.c
+++ b/git.c
@@ -423,7 +423,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
                        int nongit_ok;
                        prefix = setup_git_directory_gently(&nongit_ok);
                }
-               prefix = precompose_argv_prefix(argc, argv, prefix);
+               precompose_argv_prefix(argc, argv, NULL);
                if (use_pager == -1 && p->option & (RUN_SETUP | RUN_SETUP_GENTLY) &&
                    !(p->option & DELAY_PAGER_CONFIG))
                        use_pager = check_pager_config(p->cmd);