X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-index.c;h=81e7167438ecfc25a6f9a317af663034d653588e;hb=11d6596709e04b8d2b429f230b2ed570d013f812;hp=95a3db156bda2d1e8d2ad7bdf72a9f9a821c6f51;hpb=cef19c7af5202c547abe4c8a538ac7b9a4970f0e;p=git.git diff --git a/builtin-diff-index.c b/builtin-diff-index.c index 95a3db156..81e716743 100644 --- a/builtin-diff-index.c +++ b/builtin-diff-index.c @@ -14,6 +14,7 @@ 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 */ @@ -22,7 +23,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) argc = setup_revisions(argc, argv, &rev, NULL); for (i = 1; i < argc; i++) { const char *arg = argv[i]; - + if (!strcmp(arg, "--cached")) cached = 1; else @@ -38,5 +39,10 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) 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; }