From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v3 5/5] diff: the -w option breaks --exit-code for --raw and other output modes
Date: Mon, 21 Aug 2023 21:30:16 -0400 [thread overview]
Message-ID: <20230822013016.GA1815572@coredump.intra.peff.net> (raw)
In-Reply-To: <xmqqcyzgniaq.fsf@gitster.g>
On Mon, Aug 21, 2023 at 03:26:37PM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> >> ...
> >> 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.
> >
> > I think s/with options like/without options like/ in the final
> > paragraph?
>
> Sorry, I am confused. "diff --raw --exit-code" without "-w" reports
> with its exit status that it found differences just fine. When "-w"
> is given, without this patch, it always reports 0.
I think I just got confused by the multiple negatives "not an excuse to
fail to...".
> What I wanted to convey was ...
>
> "--raw" and friends deliberately ignore "-w" and other "look at
> contents" options.
>
> The fact they do ignore the "look at contents" options is not a
> good excuse for "diff --raw -w --exit-code" to also ignore the
> request to report the differences with its exit status. "diff
> --raw --exit-code" does report the differences as requested, and
> we should do the same when given "-w".
Yes, that conveys it more clearly (to me, anyway).
-Peff
next prev parent reply other threads:[~2023-08-22 1:30 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 ` [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 [this message]
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=20230822013016.GA1815572@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).