From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v3 5/5] diff: the -w option breaks --exit-code for --raw and other output modes
Date: Fri, 18 Aug 2023 16:59:32 -0700 [thread overview]
Message-ID: <20230818235932.3253552-6-gitster@pobox.com> (raw)
In-Reply-To: <20230818235932.3253552-1-gitster@pobox.com>
The output from "--raw", "--name-status", and "--name-only" modes in
"git diff" does depend on and does not reflect how certain different
contents are considered equal, unlike "--patch" and "--stat" output
modes do, when used with options like "-w" (another way of thinking
about it is that it is not like we recompute the hash of the blob
after removing all whitespaces to show "git diff --raw -w" output).
But that is not an excuse for "git diff --exit-code --raw" to fail
to report differences with its exit status, when used with options
like "-w". Make sure the command exits with 1 when these options
report paths that are different.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
diff.c | 6 ++++++
t/t4015-diff-whitespace.sh | 8 ++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index da965ff688..78f4e7518f 100644
--- a/diff.c
+++ b/diff.c
@@ -4744,6 +4744,10 @@ void diff_setup_done(struct diff_options *options)
else
options->prefix_length = 0;
+ /*
+ * --name-only, --name-status, --checkdiff, and -s
+ * turn other output format off.
+ */
if (options->output_format & (DIFF_FORMAT_NAME |
DIFF_FORMAT_NAME_STATUS |
DIFF_FORMAT_CHECKDIFF |
@@ -6072,6 +6076,8 @@ static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
fprintf(opt->file, "%s", diff_line_prefix(opt));
write_name_quoted(name_a, opt->file, opt->line_termination);
}
+
+ opt->found_changes = 1;
}
static void show_file_mode_name(struct diff_options *opt, const char *newdelete, struct diff_filespec *fs)
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 230a89b951..7fcffa4b11 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -11,8 +11,12 @@ TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh
-for opts in --patch --quiet -s --stat --shortstat --dirstat=lines
+for opt_res in --patch --quiet -s --stat --shortstat --dirstat=lines \
+ --raw! --name-only! --name-status!
do
+ opts=${opt_res%!} expect_failure=
+ test "$opts" = "$opt_res" ||
+ expect_failure="test_expect_code 1"
test_expect_success "status with $opts (different)" '
echo foo >x &&
@@ -40,7 +44,7 @@ do
echo foo >x &&
git add x &&
echo " foo" >x &&
- git diff -w $opts --exit-code x
+ $expect_failure git diff -w $opts --exit-code x
'
done
--
2.42.0-rc2-7-gf9972720e9
next prev parent reply other threads:[~2023-08-19 0:00 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
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 ` Junio C Hamano [this message]
2023-08-21 21:00 ` [PATCH v3 5/5] diff: the -w option breaks --exit-code for --raw and other output modes 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=20230818235932.3253552-6-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/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).