diff --git a/builtin-diff-index.c b/builtin-diff-index.c
index 083599d5c4c174cfab7c148428630534e4cd8174..2f44ebfcdd86cde2347258dbeb1e5c4b9cab0622 100644 (file)
--- a/builtin-diff-index.c
+++ b/builtin-diff-index.c
struct rev_info rev;
int cached = 0;
int i;
struct rev_info rev;
int cached = 0;
int i;
+ int result;
init_revisions(&rev, prefix);
init_revisions(&rev, prefix);
- git_config(git_default_config); /* no "diff" UI options */
+ git_config(git_diff_basic_config, NULL); /* 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];
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
if (!strcmp(arg, "--cached"))
cached = 1;
else
perror("read_cache");
return -1;
}
perror("read_cache");
return -1;
}
- return run_diff_index(&rev, cached);
+ result = run_diff_index(&rev, cached);
+ return diff_result_code(&rev.diffopt, result);
}
}