Re: [PATCH 6/6] reflog-walk: stop using fake parents

From: Jeff King <peff@peff.net>
Date: Jul 7, 2017, 03:02 UTC
Message-ID: <20170707030224.4iubuzsz2qwdhgiw@sigill.intra.peff.net>
In-Reply-To: <20170707003239.GA13431@untitled>

On Fri, Jul 07, 2017 at 12:32:39AM +0000, Eric Wong wrote:

Show 7 quoted lines

> I'm not sure why, but this is causing t1414.8 failures on 32-bit
> x86 with the latest pu with Debian jessie (oldstable).
> 
> Reverting this (beafb2c62947a6d4a97b9c3baf99fe62ec8e830f) in pu
> seems to fix the test for me.
> 
> +Cc: Ramsay since he also had a 32-bit environment.

Thanks, I was able to reproduce with CFLAGS=-m32.

Show 14 quoted lines

> --- expect	2017-07-07 00:30:57.796325232 +0000
> +++ actual	2017-07-07 00:30:57.796325232 +0000
> @@ -3,6 +3,8 @@
>  HEAD@{2} checkout: moving from master to side
>  HEAD@{3} commit: two
>  HEAD@{4} commit (initial): one
> -side@{0} commit (merge): Merge branch 'master' into side
> -side@{1} commit: three
> -side@{2} branch: Created from HEAD^
> +HEAD@{0} commit (merge): Merge branch 'master' into side
> +HEAD@{1} commit: three
> +HEAD@{2} checkout: moving from master to side
> +HEAD@{3} commit: two
> +HEAD@{4} commit (initial): one

That's quite an unexpected error (to show the HEAD reflog twice). Given that it triggers with 32-bit builds, it's like there's some funny memory error. And indeed, running it under valgrind shows a problem in add_reflog_for_walk. I'll try to dig into it. Thanks for reporting.

-Peff