Re: Can't find the revelant commit with git-log

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 7, 2011, 22:51 UTC
Message-ID: <7vk4hbsbjr.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4D4477E4.6020006@lsrfire.ath.cx>

René Scharfe <rene.scharfe@lsrfire.ath.cx> writes:

Show 12 quoted lines

> diff --git a/t/t6016-rev-list-graph-simplify-history.sh b/t/t6016-rev-list-graph-simplify-history.sh
> index f7181d1..50ffcf4 100755
> --- a/t/t6016-rev-list-graph-simplify-history.sh
> +++ b/t/t6016-rev-list-graph-simplify-history.sh
> @@ -168,6 +168,7 @@ test_expect_success '--graph --full-history --simplify-merges -- bar.txt' '
>  	echo "|\\  " >> expected &&
>  	echo "| * $C4" >> expected &&
>  	echo "* | $A5" >> expected &&
> +	echo "* | $A4" >> expected &&
>  	echo "* | $A3" >> expected &&
>  	echo "|/  " >> expected &&
>  	echo "* $A2" >> expected &&

Thanks for a patch with a test; I am not sure if this is quite correct, though.

A4 has three parents, C2, A3 and B2, and does not introduce any change with respect to bar.txt. A6 has bar.txt identical to that of A5, but we cannot omit it because we are showing its two parents (A5 and C4), and that is why we show it. A4 isn't even gets shown as a merge, so I don't understand why we need to show it?

Don't we need to also adjust the simplify-merges codepath to take this change into account, or something?