From: Eric Wong <e@80x24.org>
To: Jeff King <peff@peff.net>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>,
Junio C Hamano <gitster@pobox.com>, Kyle Meyer <kyle@kyleam.com>,
git@vger.kernel.org, Sahil Dua <sahildua2305@gmail.com>,
Ramsay Jones <ramsay@ramsayjones.plus.com>
Subject: Re: [PATCH 6/6] reflog-walk: stop using fake parents
Date: Fri, 7 Jul 2017 00:32:39 +0000 [thread overview]
Message-ID: <20170707003239.GA13431@untitled> (raw)
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
next prev parent reply other threads:[~2017-07-07 0:32 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-21 21:40 Truncating HEAD reflog on branch move brian m. carlson
2017-06-21 21:46 ` Junio C Hamano
2017-06-21 23:04 ` Kyle Meyer
2017-06-21 23:12 ` Kyle Meyer
2017-06-22 15:16 ` Jeff King
2017-06-22 18:32 ` Junio C Hamano
2017-06-22 18:45 ` Jeff King
2017-06-22 19:03 ` Junio C Hamano
2017-06-22 20:21 ` Jeff King
2017-06-22 20:32 ` Junio C Hamano
2017-06-22 21:52 ` Jeff King
2017-06-22 22:25 ` Jeff King
2017-06-23 3:13 ` Jeff King
2017-07-04 19:58 ` brian m. carlson
2017-07-04 21:24 ` Jeff King
2017-07-04 21:27 ` brian m. carlson
2017-07-04 21:28 ` Jeff King
2017-07-05 1:49 ` Junio C Hamano
2017-07-05 7:55 ` [PATCH 0/6] fixing reflog-walk oddities Jeff King
2017-07-05 7:57 ` [PATCH 1/6] reflog-walk: skip over double-null oid due to HEAD rename Jeff King
2017-07-05 17:34 ` Junio C Hamano
2017-07-05 21:21 ` Jeff King
2017-07-05 8:00 ` [PATCH 2/6] t1414: document some reflog-walk oddities Jeff King
2017-07-05 17:56 ` Junio C Hamano
2017-07-05 21:27 ` Jeff King
2017-07-05 22:45 ` Junio C Hamano
2017-07-06 7:16 ` Jeff King
2017-07-06 7:55 ` Jeff King
2017-07-06 15:42 ` Junio C Hamano
2017-07-07 5:19 ` Jeff King
2017-07-07 6:00 ` Junio C Hamano
2017-07-07 6:22 ` Jeff King
2017-07-05 20:05 ` Ramsay Jones
2017-07-05 21:30 ` Jeff King
2017-07-05 8:02 ` [PATCH 3/6] log: do not free parents when walking reflog Jeff King
2017-07-05 8:04 ` [PATCH 4/6] get_revision_1(): replace do-while with an early return Jeff King
2017-07-05 8:06 ` [PATCH 5/6] rev-list: check reflog_info before showing usage Jeff King
2017-07-05 18:07 ` Junio C Hamano
2017-07-05 21:31 ` Jeff King
2017-07-05 8:09 ` [PATCH 6/6] reflog-walk: stop using fake parents Jeff King
2017-07-07 0:32 ` Eric Wong [this message]
2017-07-07 3:02 ` Jeff King
2017-07-07 3:15 ` Jeff King
2017-07-10 9:42 ` Eric Wong
2017-07-10 11:20 ` Jeff King
2017-07-10 16:09 ` Junio C Hamano
2017-07-07 8:36 ` [PATCH v2 0/4] reflog-walk fixes for maint Jeff King
2017-07-07 8:37 ` [PATCH v2 1/4] reflog-walk: skip over double-null oid due to HEAD rename Jeff King
2017-07-07 8:39 ` [PATCH v2 2/4] reflog-walk: duplicate strings in complete_reflogs list Jeff King
2017-07-07 8:41 ` [PATCH v2 3/4] reflog-walk: don't free reflogs added to cache Jeff King
2017-07-07 8:43 ` [PATCH v2 4/4] reflog-walk: include all fields when freeing complete_reflogs Jeff King
2017-07-07 9:05 ` [PATCH v2 0/7] fixing reflog-walk oddities Jeff King
2017-07-07 9:06 ` [PATCH v2 1/7] t1414: document some " Jeff King
2017-07-07 9:21 ` Jeff King
2017-07-07 15:54 ` Kyle Meyer
2017-07-07 9:07 ` [PATCH v2 2/7] revision: disallow reflog walking with revs->limited Jeff King
2017-07-07 9:07 ` [PATCH v2 3/7] log: do not free parents when walking reflog Jeff King
2017-07-07 17:10 ` Junio C Hamano
2017-07-09 10:13 ` Jeff King
2017-07-09 16:59 ` Junio C Hamano
2017-07-10 13:27 ` Jeff King
2017-07-07 9:07 ` [PATCH v2 4/7] get_revision_1(): replace do-while with an early return Jeff King
2017-07-07 9:08 ` [PATCH v2 5/7] rev-list: check reflog_info before showing usage Jeff King
2017-07-07 9:14 ` [PATCH v2 6/7] reflog-walk: stop using fake parents Jeff King
2017-07-07 9:24 ` Jeff King
2017-07-07 15:54 ` Kyle Meyer
2017-07-09 10:08 ` Jeff King
2017-07-07 9:16 ` [PATCH v2 7/7] reflog-walk: apply --since/--until to reflog dates Jeff King
2017-07-07 20:15 ` [PATCH v2 0/4] reflog-walk fixes for maint 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=20170707003239.GA13431@untitled \
--to=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kyle@kyleam.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=sahildua2305@gmail.com \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).