git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "René Scharfe" <l.s.r@web.de>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	German Lashevich <german.lashevich@gmail.com>,
	Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH v2 0/3] diff: fix --exit-code with external diff
Date: Wed, 5 Jun 2024 10:31:32 +0200	[thread overview]
Message-ID: <6fa51a62-5dc1-4865-9f79-eaf7d65189ab@web.de> (raw)
In-Reply-To: <e2e4a4e9-55db-403c-902d-fd8af3aea05c@web.de>

Changes since v1:
- old patch 1 was merged
- old patch 2 was merged and reverted
- new patch 1 adds tests that exercises diff --exit-code and --quiet
  together with all methods for specifying external diffs
- new patch 2 adds a struct to store the flag that patch 3 adds
- patch 3 adds configuration options and an environment variable to
  accept diff(1)-style exit codes from external diffs

  t4020: test exit code with external diffs
  userdiff: add and use struct external_diff
  diff: let external diffs report that changes are uninteresting

 Documentation/config/diff.txt   | 14 ++++++++
 Documentation/git.txt           |  7 ++++
 Documentation/gitattributes.txt |  5 +++
 diff.c                          | 62 ++++++++++++++++++++++++---------
 t/t4020-diff-external.sh        | 44 +++++++++++++++++++++++
 userdiff.c                      |  8 +++--
 userdiff.h                      |  7 +++-
 7 files changed, 128 insertions(+), 19 deletions(-)

--
2.45.2

  parent reply	other threads:[~2024-06-05  8:31 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
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     ` René Scharfe [this message]
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=6fa51a62-5dc1-4865-9f79-eaf7d65189ab@web.de \
    --to=l.s.r@web.de \
    --cc=german.lashevich@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood@dunelm.org.uk \
    /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).