public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Phillip Wood <phillip.wood123@gmail•com>
To: "René Scharfe" <l.s.r@web•de>,
	"German Lashevich" <german.lashevich@gmail•com>,
	git@vger•kernel.org
Cc: Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH 2/2] diff: fix --exit-code with external diff
Date: Sun, 5 May 2024 16:25:52 +0100	[thread overview]
Message-ID: <99337bc2-a691-45f7-9b6f-74ededbd9a78@gmail.com> (raw)
In-Reply-To: <e2e4a4e9-55db-403c-902d-fd8af3aea05c@web.de>

Hi René

Thanks for working on this

On 05/05/2024 11:20, René Scharfe wrote:
> Finally, capture the output of the external diff and only register a
> change by setting found_changes if the program wrote anything.

I worry that this will lead to regression reports like 
https://lore.kernel.org/git/CA+dzEBn108QoMA28f0nC8K21XT+Afua0V2Qv8XkR8rAeqUCCZw@mail.gmail.com/ 
as the external diff will not see a terminal on stdout anymore. I'm not 
really clear why we ignore the exit code of the external diff command. 
Merge strategies are expected to exit 0 on success, 1 when there are 
conflicts and another non-zero value for other errors - it would be nice 
to do something similar here where 1 means "there were differences" but 
it is probably too late to do that without a config value to indicate 
that we should trust the exit code.

Best Wishes

Phillip

next prev parent reply	other threads:[~2024-05-05 15:25 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-20  1:13 Possible git-diff bug when using exit-code with diff filters German Lashevich
2024-04-21 10:42 ` René Scharfe
2024-04-21 18:17   ` Junio C Hamano
2024-04-21 18:32     ` rsbecker
2024-04-21 19:09       ` Junio C Hamano
2024-04-21 20:18         ` rsbecker
2024-05-05 10:19     ` René Scharfe
2024-05-06 17:22       ` Junio C Hamano
2024-05-05 10:19   ` [PATCH 1/2] diff: report unmerged paths as changes in run_diff_cmd() René Scharfe
2024-05-05 10:20   ` [PATCH 2/2] diff: fix --exit-code with external diff René Scharfe
2024-05-05 15:25     ` Phillip Wood [this message]
2024-05-06 17:31       ` Junio C Hamano
2024-05-06 18:23       ` René Scharfe
2024-05-08 15:25         ` phillip.wood123
2024-05-11 20:32           ` René Scharfe
2024-05-12  9:38             ` René Scharfe
2024-06-05  8:31     ` [PATCH v2 0/3] " René Scharfe
2024-06-05  8:35       ` [PATCH v2 1/3] t4020: test exit code with external diffs René Scharfe
2024-06-05  8:36       ` [PATCH v2 2/3] userdiff: add and use struct external_diff René Scharfe
2024-06-05  8:38       ` [PATCH v2 3/3] diff: let external diffs report that changes are uninteresting René Scharfe
2024-06-06  6:39         ` Johannes Sixt
2024-06-06  8:28           ` René Scharfe
2024-06-06 15:49             ` Junio C Hamano
2024-06-06  9:48         ` Phillip Wood
2024-06-07  8:19           ` René Scharfe
2024-06-05 16:47       ` [PATCH v2 0/3] diff: fix --exit-code with external diff Junio C Hamano
2024-06-09  7:35     ` [PATCH v3 " René Scharfe
2024-06-09  7:38       ` [PATCH v3 1/3] t4020: test exit code with external diffs René Scharfe
2024-06-10 16:33         ` Junio C Hamano
2024-06-09  7:39       ` [PATCH v3 2/3] userdiff: add and use struct external_diff René Scharfe
2024-06-09  7:41       ` [PATCH v3 3/3] diff: let external diffs report that changes are uninteresting René Scharfe
2024-06-10 13:48       ` [PATCH v3 0/3] diff: fix --exit-code with external diff phillip.wood123

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=99337bc2-a691-45f7-9b6f-74ededbd9a78@gmail.com \
    --to=phillip.wood123@gmail$(echo .)com \
    --cc=german.lashevich@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitster@pobox$(echo .)com \
    --cc=l.s.r@web$(echo .)de \
    --cc=phillip.wood@dunelm$(echo .)org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox