X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-stages.c;h=5960e089975f1f27c55c5bd8ea1c968ffe695d1f;hb=06c084d28b150ac1e2ed0c6f3ce7db6ca42dfc67;hp=30931fe0498753ed3a7f68be064027391a82e677;hpb=f252281102514d8d3cc15a3df5ae633619c93835;p=git.git diff --git a/builtin-diff-stages.c b/builtin-diff-stages.c index 30931fe04..5960e0899 100644 --- a/builtin-diff-stages.c +++ b/builtin-diff-stages.c @@ -55,13 +55,12 @@ static void diff_stages(int stage1, int stage2, const char **pathspec) } } -int cmd_diff_stages(int ac, const char **av, char **envp) +int cmd_diff_stages(int ac, const char **av, const char *prefix) { int stage1, stage2; - const char *prefix = setup_git_directory(); const char **pathspec = NULL; - git_config(git_diff_config); + git_config(git_default_config); /* no "diff" UI options */ read_cache(); diff_setup(&diff_options); while (1 < ac && av[1][0] == '-') {