X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=builtin-diff-files.c;h=4abe3c28fbf98542db35c13f618b7088225740e9;hb=53a5b443b4b3d5beb102615f402e0e4da5ba9179;hp=046b7e34b5d5c6306d335dddbd5e283c8166e80e;hpb=d577bc58a3424f4d0d7f7c8094753b92cb7cb823;p=git.git diff --git a/builtin-diff-files.c b/builtin-diff-files.c index 046b7e34b..4abe3c28f 100644 --- a/builtin-diff-files.c +++ b/builtin-diff-files.c @@ -21,7 +21,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) prefix = setup_git_directory_gently(&nongit); 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; if (!setup_diff_no_index(&rev, argc, argv, nongit, prefix)) @@ -31,7 +31,5 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) if (!rev.diffopt.output_format) rev.diffopt.output_format = DIFF_FORMAT_RAW; result = run_diff_files_cmd(&rev, argc, argv); - if (DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS)) - return DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0; - return result; + return diff_result_code(&rev.diffopt, result); }