X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-index.c;h=d90eba95a6be17bd0486e0311c2657b1f69ab7d9;hb=93969438dca50c7f0039fcf35e7ab82776d4122f;hp=dc52c054ee680132ea2a5041d84c976cf036c773;hpb=fff8fd5b1ee9c13694c29ba3544f5b1ebf0f4fb2;p=git.git diff --git a/builtin-diff-index.c b/builtin-diff-index.c index dc52c054e..d90eba95a 100644 --- a/builtin-diff-index.c +++ b/builtin-diff-index.c @@ -9,13 +9,14 @@ 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; @@ -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; }