Merge branch 'pb/prepare-commit-msg'

[git.git] / builtin-diff.c

diff --git a/builtin-diff.c b/builtin-diff.c
index 9d878f6a71a5a7a53b11112396cb963ba149d6e6..8d7a5697f2b429f6240a89e28422f48ef18aee3b 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -190,7 +190,7 @@ static void refresh_index_quietly(void)
        refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED);
 
        if (active_cache_changed &&
-           !write_cache(fd, active_cache, active_nr) && !close(fd))
+           !write_cache(fd, active_cache, active_nr))
                commit_locked_index(lock_file);
 
        rollback_lock_file(lock_file);
@@ -244,11 +244,11 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
        DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
        DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
 
-       /* If the user asked for our exit code then don't start a
+       /*
+        * If the user asked for our exit code then don't start a
         * pager or we would end up reporting its exit code instead.
         */
-       if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS) &&
-           (!(rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)))
+       if (!DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS))
                setup_pager();
 
        /* Do we have --cached and not have a pending object, then
@@ -352,10 +352,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
        else
                result = builtin_diff_combined(&rev, argc, argv,
                                             ent, ents);
-       if (DIFF_OPT_TST(&rev.diffopt, EXIT_WITH_STATUS))
-               result = DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0;
-       if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
-               return DIFF_OPT_TST(&rev.diffopt, CHECK_FAILED) != 0;
+       result = diff_result_code(&rev.diffopt, result);
        if (1 < rev.diffopt.skip_stat_unmatch)
                refresh_index_quietly();
        return result;