diff: report unmerged paths as changes in run_diff_cmd()

You can ask the diff machinery to let the exit code indicate whether
there are changes, e.g. with --quiet.  It as two ways to calculate that
bit: The quick one assumes blobs with different hashes have different
content, and the more elaborate way actually compares the contents,
possibly applying transformations like ignoring whitespace.

The quick way considers an unmerged file to be a change and reports
exit code 1, which makes sense.

The slower path uses the struct diff_options member found_changes to
indicate whether the blobs differ even with the transformations applied.
It's not set for unmerged files, though, resulting in exit code 0.

Set found_changes in run_diff_cmd() for unmerged files, for a consistent
exit code of 1 if there's an unmerged file, regardless of whether
whitespace is ignored.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index e50def45383eba4af74300802a161bdeeb6c4e8f..38773317a13a0920e2d455c7d4aecdd475833118 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4547,6 +4547,7 @@ static void run_diff_cmd(const char *pgm,
                             o, complete_rewrite);
        } else {
                fprintf(o->file, "* Unmerged path %s\n", name);
+               o->found_changes = 1;
        }
 }
 

diff --git a/t/t4046-diff-unmerged.sh b/t/t4046-diff-unmerged.sh
index ffaf69335f7b224f76ece7228435a4ce057e5c83..c606ee4c40e3c88af09946078db691cc59a7f5d5 100755 (executable)
--- a/t/t4046-diff-unmerged.sh
+++ b/t/t4046-diff-unmerged.sh
@@ -96,4 +96,12 @@ test_expect_success 'diff --stat' '
        test_cmp diff-stat.expect diff-stat.actual
 '
 
+test_expect_success 'diff --quiet' '
+       test_expect_code 1 git diff --cached --quiet
+'
+
+test_expect_success 'diff --quiet --ignore-all-space' '
+       test_expect_code 1 git diff --cached --quiet --ignore-all-space
+'
+
 test_done