X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-index.c;h=81e7167438ecfc25a6f9a317af663034d653588e;hb=e4cd6c7a20bfc776086817671d58e09060a8079a;hp=dc52c054ee680132ea2a5041d84c976cf036c773;hpb=2dcb927f37976ef5185cef5452516b170b14cd6c;p=git.git diff --git a/builtin-diff-index.c b/builtin-diff-index.c index dc52c054e..81e716743 100644 --- a/builtin-diff-index.c +++ b/builtin-diff-index.c @@ -9,20 +9,21 @@ static const char diff_cache_usage[] = "[] [...]" 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); + init_revisions(&rev, prefix); git_config(git_default_config); /* no "diff" UI options */ rev.abbrev = 0; 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, 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; }