Merge branch 'jk/maint-send-email-compose'

diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index 556c506bfa7b5c5ef739d4203c585412a2764073..2b955deb912a38ccabb115f8d3a6c7feb815eb45 100644 (file)
--- 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,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);
 }