X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-index.c;h=2b955deb912a38ccabb115f8d3a6c7feb815eb45;hb=340814636dde3cbd2e461b12f9ae832d2100766a;hp=81e7167438ecfc25a6f9a317af663034d653588e;hpb=e2b1accc59ab5d682d71fd801ebe959c3e871488;p=git.git diff --git a/builtin-diff-index.c b/builtin-diff-index.c index 81e716743..2b955deb9 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); /* no "diff" UI options */ rev.abbrev = 0; argc = setup_revisions(argc, argv, &rev, NULL); @@ -44,5 +44,5 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) return -1; } result = run_diff_index(&rev, cached); - return rev.diffopt.exit_with_status ? rev.diffopt.has_changes: result; + return diff_result_code(&rev.diffopt, result); }