Update .mailmap with "Michael"

diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index a1fa1b85cf741cd6b5f06afd02abbe618e86f5d1..d90eba95a6be17bd0486e0311c2657b1f69ab7d9 100644 (file)
--- a/builtin-diff-index.c
+++ b/builtin-diff-index.c
@@ -9,14 +9,15 @@ static const char diff_cache_usage[] =
 "[<common diff options>] <tree-ish> [<path>...]"
 COMMON_DIFF_OPTIONS_HELP;
 
-int cmd_diff_index(int argc, const char **argv, char **envp)
+int cmd_diff_index(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;
        int cached = 0;
        int i;
+       int result;
 
+       init_revisions(&rev, prefix);
        git_config(git_default_config); /* no "diff" UI options */
-       init_revisions(&rev);
        rev.abbrev = 0;
 
        argc = setup_revisions(argc, argv, &rev, NULL);
@@ -38,5 +39,10 @@ int cmd_diff_index(int argc, const char **argv, char **envp)
        if (rev.pending.nr != 1 ||
            rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
                usage(diff_cache_usage);
-       return run_diff_index(&rev, cached);
+       if (read_cache() < 0) {
+               perror("read_cache");
+               return -1;
+       }
+       result = run_diff_index(&rev, cached);
+       return rev.diffopt.exit_with_status ? rev.diffopt.has_changes: result;
 }