Re: [PATCH] log: --remerge-diff needs to keep around commit parents

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 11, 2024, 22:13 UTC
Message-ID: <xmqqa5e5berx.fsf@gitster.g>
In-Reply-To: <b7488a36-0ba6-0847-47cb-6a5f3edec689@gmx.de>

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

Show 24 quoted lines

> 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.