X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-index.c;h=2b955deb912a38ccabb115f8d3a6c7feb815eb45;hb=0ab9e1e8cdaefdd33bf24bb0be0ec766483f8bbe;hp=d90eba95a6be17bd0486e0311c2657b1f69ab7d9;hpb=00cec846f157b5363b0967d1e4cba76b44d48e77;p=git.git diff --git a/builtin-diff-index.c b/builtin-diff-index.c index d90eba95a..2b955deb9 100644 --- a/builtin-diff-index.c +++ b/builtin-diff-index.c @@ -17,13 +17,13 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) int result; init_revisions(&rev, prefix); - git_config(git_default_config); /* no "diff" UI options */ + git_config(git_diff_basic_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 @@ -44,5 +44,5 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix) return -1; } result = run_diff_index(&rev, cached); - return rev.diffopt.exit_with_status ? rev.diffopt.has_changes: result; + return diff_result_code(&rev.diffopt, result); }