From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Paul Watson <pwatson2@wellmed.net>
Subject: Re: [PATCH] diff: tighten interaction between -w and --exit-code
Date: Thu, 17 Aug 2023 01:10:59 -0400 [thread overview]
Message-ID: <20230817051059.GA3006160@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqqv8ded018.fsf@gitster.g>
On Wed, Aug 16, 2023 at 04:45:23PM -0700, Junio C Hamano wrote:
> To fix this, do two things:
>
> * The codepath to generate "--stat" output already calls the
> underlying xdiff machinery with appropriate options like "-w",
> but it did not update .found_changes bit. Fixing "--stat -w"
> combined with "--exit-code" thus becomes just the matter of
> adding these missing .found_changes assignment.
>
> * For generating "--name-only", "--name-status", etc., the code
> does not look into the contents of the blob objects at all. For
> now, extend the special case used for "-s -w --exit-code" to run
> a silent "--patch" computation to set the .found_changes bit
> correctly.
Nicely explained overall, but one hunk of the patch left me wondering...
> @@ -3828,6 +3830,11 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
> diffstat_consume, diffstat, &xpp, &xecfg))
> die("unable to generate diffstat for %s", one->path);
>
> + /* Do this before cancelling the no-op diffstat below */
> + if (diffstat->files[diffstat->nr - 1]->added ||
> + diffstat->files[diffstat->nr - 1]->deleted)
> + o->found_changes = 1;
> +
So this is checking whether any lines were added/deleted to see if the
stat was a noop. But what about non-content bits, like mode changes?
E.g., the tests below all fail (but would pass without "-w"):
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 1b944d77e4..54e56ad911 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -25,6 +25,14 @@ test_expect_success 'exit status with -w --name-only (different but equivalent)'
git diff -w --name-only --exit-code x
'
+test_expect_success 'exit status with -w --name-only (mode change)' '
+ test_when_finished "git reset" &&
+ echo foo >x &&
+ git add x &&
+ git update-index --chmod=+x x &&
+ test_expect_code 1 git diff -w --name-only --exit-code
+'
+
test_expect_success 'exit status with -w --raw (different)' '
echo foo >x &&
git add x &&
@@ -39,6 +47,14 @@ test_expect_success 'exit status with -w --raw (different but equivalent)' '
git diff -w --raw --exit-code x
'
+test_expect_success 'exit status with -w --raw (mode change)' '
+ test_when_finished "git reset" &&
+ echo foo >x &&
+ git add x &&
+ git update-index --chmod=+x x &&
+ test_expect_code 1 git diff -w --raw --exit-code
+'
+
test_expect_success 'exit status with -w --stat (different)' '
echo foo >x &&
git add x &&
@@ -53,6 +69,14 @@ test_expect_success 'exit status with -w --stat (different but equivalent)' '
git diff -w --stat --exit-code x
'
+test_expect_success 'exit status with -w --stat (mode change)' '
+ test_when_finished "git reset" &&
+ echo foo >x &&
+ git add x &&
+ git update-index --chmod=+x x &&
+ test_expect_code 1 git diff -w --stat --exit-code
+'
+
test_expect_success 'exit status with -w --shortstat (different)' '
echo foo >x &&
git add x &&
@@ -67,6 +91,14 @@ test_expect_success 'exit status with -w --shortstat (different but equivalent)'
git diff -w --shortstat --exit-code x
'
+test_expect_success 'exit status with -w --shortstat (mode change)' '
+ test_when_finished "git reset" &&
+ echo foo >x &&
+ git add x &&
+ git update-index --chmod=+x x &&
+ test_expect_code 1 git diff -w --shortstat --exit-code
+'
+
test_expect_success 'exit status with -w --quiet (different)' '
echo foo >x &&
git add x &&
@@ -81,6 +113,14 @@ test_expect_success 'exit status with -w --quiet (different but equivalent)' '
git diff -w --quiet --exit-code x
'
+test_expect_success 'exit status with -w --quiet (mode change)' '
+ test_when_finished "git reset" &&
+ echo foo >x &&
+ git add x &&
+ git update-index --chmod=+x x &&
+ test_expect_code 1 git diff -w --quiet --exit-code
+'
+
test_expect_success 'exit status with -w --summary (different)' '
echo foo >x &&
git add x &&
@@ -95,6 +135,14 @@ test_expect_success 'exit status with -w --summary (different but equivalent)' '
git diff -w --summary --exit-code x
'
+test_expect_success 'exit status with -w --summary (mode change)' '
+ test_when_finished "git reset" &&
+ echo foo >x &&
+ git add x &&
+ git update-index --chmod=+x x &&
+ test_expect_code 1 git diff -w --summary --exit-code
+'
+
test_expect_success 'exit status with -w -s (different)' '
echo foo >x &&
git add x &&
@@ -109,6 +157,14 @@ test_expect_success 'exit status with -w -s (different but equivalent)' '
git diff -w -s --exit-code x
'
+test_expect_success 'exit status with -w -s (mode change)' '
+ test_when_finished "git reset" &&
+ echo foo >x &&
+ git add x &&
+ git update-index --chmod=+x x &&
+ test_expect_code 1 git diff -w -s --exit-code x
+'
+
test_expect_success "Ray Lehtiniemi's example" '
cat <<-\EOF >x &&
do {
For the diffstat case, I think we could check the mode here, but there
are other cases (e.g., adding or deleting an empty file). The code right
below the hunk I quoted seems to try to deal with that (the "cancelling
the no-op" your comment mentions). I'm not sure if we want something
like this:
diff --git a/diff.c b/diff.c
index 38b57b589f..1dbfdaeff0 100644
--- a/diff.c
+++ b/diff.c
@@ -3853,6 +3853,8 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
&& one->mode == two->mode) {
free_diffstat_file(file);
diffstat->nr--;
+ } else {
+ o->found_changes = 1;
}
}
}
but I haven't dug too far (and of course all of the other options also
need something similar to catch this case).
-Peff
next prev parent reply other threads:[~2023-08-17 5:12 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-04 16:46 git bug report Paul Watson
2023-08-04 17:28 ` rsbecker
2023-08-04 17:48 ` [EXTERNAL] " Paul Watson
2023-08-04 18:12 ` rsbecker
2023-08-07 15:46 ` Paul Watson
2023-08-08 13:07 ` Paul Watson
2023-08-08 13:28 ` rsbecker
2023-08-08 17:07 ` Junio C Hamano
2023-08-16 23:45 ` [PATCH] diff: tighten interaction between -w and --exit-code Junio C Hamano
2023-08-17 5:10 ` Jeff King [this message]
2023-08-17 16:12 ` Junio C Hamano
2023-08-17 19:49 ` Jeff King
2023-08-17 19:56 ` Junio C Hamano
2023-08-17 22:29 ` [PATCH v2 0/5] fix interactions with "-w" and "--exit-code" Junio C Hamano
2023-08-17 22:29 ` [PATCH v2 1/5] diff: --dirstat leakfix Junio C Hamano
2023-08-17 22:29 ` [PATCH v2 2/5] diff: move the fallback "--exit-code" code down Junio C Hamano
2023-08-17 22:29 ` [PATCH v2 3/5] diff: mode-only change should be noticed by "--patch -w --exit-code" Junio C Hamano
2023-08-18 21:15 ` Junio C Hamano
2023-08-17 22:29 ` [PATCH v2 4/5] diff: teach "--stat -w --exit-code" to notice differences Junio C Hamano
2023-08-17 22:29 ` [PATCH v2 5/5] diff: teach "--name-status" and friends to honor "--exit-code -w" Junio C Hamano
2023-08-17 22:37 ` [PATCH v2 0/5] fix interactions with "-w" and "--exit-code" Junio C Hamano
2023-08-18 23:59 ` [PATCH v3 " Junio C Hamano
2023-08-18 23:59 ` [PATCH v3 1/5] diff: move the fallback "--exit-code" code down Junio C Hamano
2023-08-21 20:41 ` Jeff King
2023-08-18 23:59 ` [PATCH v3 2/5] diff: mode-only change should be noticed by "--patch -w --exit-code" Junio C Hamano
2023-08-18 23:59 ` [PATCH v3 3/5] diff: teach "--stat -w --exit-code" to notice differences Junio C Hamano
2023-08-21 20:45 ` Jeff King
2023-08-18 23:59 ` [PATCH v3 4/5] t4040: remove test that succeeded for a wrong reason Junio C Hamano
2023-08-18 23:59 ` [PATCH v3 5/5] diff: the -w option breaks --exit-code for --raw and other output modes Junio C Hamano
2023-08-21 21:00 ` Jeff King
2023-08-21 21:08 ` Jeff King
2023-08-21 22:23 ` Jeff King
2023-08-21 22:16 ` Junio C Hamano
2023-08-21 22:26 ` Junio C Hamano
2023-08-22 1:30 ` Jeff King
2023-08-21 21:02 ` [PATCH v3 0/5] fix interactions with "-w" and "--exit-code" Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230817051059.GA3006160@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pwatson2@wellmed.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).