Merge branch 'ar/commit-cleanup'

diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index 81e7167438ecfc25a6f9a317af663034d653588e..0f2390a20a6a138388564cd5e0395aee0a48b59c 100644 (file)
--- a/builtin-diff-index.c
+++ b/builtin-diff-index.c
@@ -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);
 }