list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <>
To: "Ævar Arnfjörð Bjarmason" <>
Cc:, "René Scharfe" <>,
	"Michał Kępień" <>
Subject: Re: [PATCH] diff: fix a segfault in >2 tree -I<regex> and --output=<file>
Date: Tue, 24 May 2022 12:38:49 -0700	[thread overview]
Message-ID: <xmqqmtf6hgae.fsf@gitster.g> (raw)
In-Reply-To: <> (=?utf-8?B?IsOG?= =?utf-8?B?dmFyIEFybmZqw7Zyw7A=?= Bjarmason"'s message of "Tue, 24 May 2022 13:38:16 +0200")

Ævar Arnfjörð Bjarmason <> writes:

> I.e. the "right" thing to do in this case would require a much more
> involved fix. We've somehow ended up not supporting --output=<file>, -I
> and probably many other options in the combined-diff mode, which both in
> testing and in this part of the implementation seems to have become an
> afterthought.

OK, a hopefully final question.

How much less involved is it to add a new code (without doing
anything in this patch) to detect and die on the combination of
combined-diff with these two options, so that we can document the
fact that we do not support them?  It would give us much better way
forward than leaving the command silently ignore and give result
that is not in line with what was asked, wouldn't it?  That way, the
much more involved "fix" will turn into a change to add a missing


  reply	other threads:[~2022-05-24 19:38 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-14  9:32 Bug: combined diff with --ignore-matching-lines René Scharfe
2022-05-23 18:31 ` [PATCH] diff: fix a segfault in >2 tree -I<regex> and --output=<file> Ævar Arnfjörð Bjarmason
2022-05-23 20:08   ` Junio C Hamano
2022-05-24 11:38     ` Ævar Arnfjörð Bjarmason
2022-05-24 19:38       ` Junio C Hamano [this message]
2022-05-24 20:17         ` Ævar Arnfjörð Bjarmason
2022-06-18 11:12           ` René Scharfe
2022-06-18 11:12           ` [PATCH 1/2] combine-diff: abort if --ignore-matching-lines is given René Scharfe
2022-06-21 15:35             ` Junio C Hamano
2022-06-21 15:58               ` René Scharfe
2022-06-21 16:55                 ` Junio C Hamano
2022-06-18 11:12           ` [PATCH 2/2] combine-diff: abort if --output " René Scharfe

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqmtf6hgae.fsf@gitster.g \ \ \ \ \ \
    --subject='Re: [PATCH] diff: fix a segfault in >2 tree -I<regex> and --output=<file>' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

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 read-only IMAP folder(s) and NNTP newsgroup(s).