mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 10:26:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

diff: mode-only change should be noticed by "--patch -w --exit-code"

Browse Source 
The codepath to notice the content-level changes, taking certain
no-op changes like "ignore whitespace" into account, forgot that
a mode-only change is still a change.  This resulted in

    $ git diff --patch --exit-code -w

to exit with status 0 even when there is such a mode-only change,
breaking both "--patch" and "--quiet" output formats.

Teach the builtin_diff() codepath that creation and deletion as well
as mode changes are all interesting changes.

Note that the test specifically checks removal of an empty file,
because if there is anything in the preimage (i.e. the removed file
is not empty), the removal would still trigger textual patch output
and the codepath for that does update .found_changes bit to report
that it found an interesting change.  We need to make sure that the
.found_changes bit is set even without triggering textual patch
output.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2023-08-18 16:59:29 -07:00
parent 5f107caed7
commit c9a3e724cf
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diff.c
View File

@ -3497,18 +3497,21 @@ static void builtin_diff(const char *name_a,
strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset);
if (xfrm_msg)
strbuf_addstr(&header, xfrm_msg);
o->found_changes = 1;
must_show_header = 1;
}
else if (lbl[1][0] == '/') {
strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset);
if (xfrm_msg)
strbuf_addstr(&header, xfrm_msg);
o->found_changes = 1;
must_show_header = 1;
}
else {
if (one->mode != two->mode) {
strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, meta, one->mode, reset);
strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, meta, two->mode, reset);
o->found_changes = 1;
must_show_header = 1;
}
if (xfrm_msg)

35
t/t4015-diff-whitespace.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright (c) 2006 Johannes E. Schindelin
#
# Copyright (c) 2023 Google LLC
test_description='Test special whitespace in diff engine.
@ -11,6 +11,39 @@ TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh
for opts in --patch --quiet -s
do
test_expect_success "status with $opts (different)" '
echo foo >x &&
git add x &&
echo bar >x &&
test_expect_code 1 git diff -w $opts --exit-code x
'
test_expect_success POSIXPERM "status with $opts (mode differs)" '
test_when_finished "git update-index --chmod=-x x" &&
echo foo >x &&
git add x &&
git update-index --chmod=+x x &&
test_expect_code 1 git diff -w $opts --exit-code x
'
test_expect_success "status with $opts (removing an empty file)" '
: >x &&
git add x &&
rm x &&
test_expect_code 1 git diff -w $opts --exit-code -- x
'
test_expect_success "status with $opts (different but equivalent)" '
echo foo >x &&
git add x &&
echo " foo" >x &&
git diff -w $opts --exit-code x
'
done
test_expect_success "Ray Lehtiniemi's example" '
cat <<-\EOF >x &&
do {