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

From: Eric Wong <e@80x24.org>
Date: Jul 7, 2017, 00:32 UTC
Message-ID: <20170707003239.GA13431@untitled>
In-Reply-To: <20170705080904.idlpm6ecslzfbm75@sigill.intra.peff.net>

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.

--8<-- ok 7 - --parents shows true parents

expecting success: 
	{
		do_walk HEAD &&
		do_walk side
	} >expect &&
	do_walk HEAD side >actual &&
	test_cmp expect actual

--- 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
not ok 8 - walking multiple reflogs shows both
#	
#		{
#			do_walk HEAD &&
#			do_walk side
#		} >expect &&
#		do_walk HEAD side >actual &&
#		test_cmp expect actual
#	

expecting success: 
	head=$(git rev-parse HEAD) &&
	one=$(git rev-parse one) &&
	ident="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
	echo "$head $one $ident	broken reflog entry" >>.git/logs/HEAD &&

	echo $one >expect &&
	git log -g --format=%H -1 >actual &&
	test_cmp expect actual

ok 9 - walk prefers reflog to ref tip