X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=builtin-diff-index.c;h=2f44ebfcdd86cde2347258dbeb1e5c4b9cab0622;hb=c6955fec546f339b258a1cba0e23618010e5c260;hp=556c506bfa7b5c5ef739d4203c585412a2764073;hpb=d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9;p=git.git diff --git a/builtin-diff-index.c b/builtin-diff-index.c index 556c506bf..2f44ebfcd 100644 --- a/builtin-diff-index.c +++ b/builtin-diff-index.c @@ -17,7 +17,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) int result; init_revisions(&rev, prefix); - git_config(git_default_config); /* no "diff" UI options */ + git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ rev.abbrev = 0; argc = setup_revisions(argc, argv, &rev, NULL); @@ -44,7 +44,5 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) return -1; } result = run_diff_index(&rev, cached); - if (DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS)) - return DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0; - return result; + return diff_result_code(&rev.diffopt, result); }