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

From: Junio C Hamano <gitster@pobox•com>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail•com>,
	git@vger•kernel.org,  Johannes Sixt <j6t@kdbg•org>,
	 Elijah Newren <newren@gmail•com>
Subject: Re: [PATCH] log: --remerge-diff needs to keep around commit parents
Date: Tue, 12 Nov 2024 07:13:06 +0900	[thread overview]
Message-ID: <xmqqa5e5berx.fsf@gitster.g> (raw)
In-Reply-To: <b7488a36-0ba6-0847-47cb-6a5f3edec689@gmx.de> (Johannes Schindelin's message of "Mon, 11 Nov 2024 19:32:14 +0100 (CET)")

Johannes Schindelin <Johannes.Schindelin@gmx•de> writes:

> I consider these examples less clear, but they are still affected:
>
> 	git show --remerge-diff v2.45.2^0
> 	vs
> 	git show --remerge-diff v2.44.2^0 v2.45.2^0
>
> 	git show --remerge-diff v2.45.1~1
> 	vs
> 	git log --topo-order --first-parent --remerge-diff v2.44.2 v2.45.1
>
> Concretely, these diffs should be empty, but are not:
>
> 	git diff --no-index \
> 		<(git show --remerge-diff v2.45.2^0 | sed 1d) \
> 		<(git show --remerge-diff v2.44.2^0 v2.45.2^0 | sed 1,/^commit/d)
>
> 	and
>
> 	git diff --no-index \
> 		<(git show --remerge-diff v2.45.1~1 | grep -v ^commit) \
> 		<(git log --topo-order --first-parent -6 --remerge-diff v2.44.2 v2.45.1 |
> 		  sed '1,/^commit 1c00f92eb5ee4a48ab615eefa41f2dd6024d43bc/d;/^commit/,$d')
>
> No `--reverse` required, not even clock skew.

As we often tell contributors, questions in reviewer comments should
be also answered in an updated patch, so that future readers of "git
log", who cannot ask direct questions to the author of the patch, do
not have to ask the same questions.  Can we add an explanation how
this affects forward traversal in a three-line paragraph?

Thanks.

next prev parent reply	other threads:[~2024-11-11 22:13 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-08 13:43 [PATCH] log: --remerge-diff needs to keep around commit parents Johannes Schindelin via GitGitGadget
2024-11-08 15:47 ` Elijah Newren
2024-11-11  1:52   ` Junio C Hamano
2024-11-11  1:46 ` Junio C Hamano
2024-11-11 18:32   ` Johannes Schindelin
2024-11-11 22:13     ` Junio C Hamano [this message]
2024-11-11 18:33 ` [PATCH v2] " Johannes Schindelin via GitGitGadget
2024-12-12 10:29   ` [PATCH v3] " Johannes Schindelin via GitGitGadget
2024-12-13 15:02     ` Junio C Hamano

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=xmqqa5e5berx.fsf@gitster.g \
    --to=gitster@pobox$(echo .)com \
    --cc=Johannes.Schindelin@gmx$(echo .)de \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitgitgadget@gmail$(echo .)com \
    --cc=j6t@kdbg$(echo .)org \
    --cc=newren@gmail$(echo .)com \
    /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