From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: "brian m. carlson" <sandals@crustytoothpaste•net>,
Kyle Meyer <kyle@kyleam•com>,
git@vger•kernel.org, Sahil Dua <sahildua2305@gmail•com>,
Eric Wong <e@80x24•org>
Subject: Re: [PATCH v2 3/7] log: do not free parents when walking reflog
Date: Sun, 09 Jul 2017 09:59:33 -0700 [thread overview]
Message-ID: <xmqqtw2l8s22.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170709101351.qcwgtzly72wwvwmq@sigill.intra.peff.net> (Jeff King's message of "Sun, 9 Jul 2017 06:13:51 -0400")
Jeff King <peff@peff•net> writes:
> On Fri, Jul 07, 2017 at 10:10:54AM -0700, Junio C Hamano wrote:
>
>> > diff --git a/builtin/log.c b/builtin/log.c
>> > index 8ca1de9894..9c8bb3b5c3 100644
>> > --- a/builtin/log.c
>> > +++ b/builtin/log.c
>> > @@ -374,9 +374,9 @@ static int cmd_log_walk(struct rev_info *rev)
>> > if (!rev->reflog_info) {
>> > /* we allow cycles in reflog ancestry */
>> > free_commit_buffer(commit);
>> > + free_commit_list(commit->parents);
>> > + commit->parents = NULL;
>>
>> After step 6/7, we no longer "allow cycles in reflog ancestry", as
>> there will be no reflog ancestry to speak of ;-), so it would be
>> nice to remove the comment above in that step. But alternatively,
>> we can rephrase the comment here, to say something like "the same
>> commit can be shown multiple times while showing entries from the
>> reflog" instead.
>
> I actually think the comment is a bit obtuse in the first place. The
> real issue is that we show commits multiple times. That's caused by
> cycles, yes, but also by us clearing the SEEN flag. ;)
>
> Maybe this on top?
Yup, that is a much better version of what I had in mind that can go
either before this step as a preparatory cleanup, squashed into this
as "while at it", or after the series as a finishing touches. The
last one will let the codebase lie for a short while, though, so I am
likely to squash it in or wiggle it under.
Thanks.
>
> -- >8 --
> Subject: [PATCH] log: clarify comment about reflog cycles
>
> When we're walking reflogs, we leave the commit buffer and
> parents in place. A comment explains that this is due to
> "cycles". But the interesting thing is the unsaid
> implication: that the cycles (plus our clearing of the SEEN
> flag) will cause us to show commits multiple times. Let's
> spell it out.
>
> Signed-off-by: Jeff King <peff@peff•net>
> ---
> builtin/log.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/log.c b/builtin/log.c
> index 9c8bb3b5c..630d6cff2 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -372,7 +372,10 @@ static int cmd_log_walk(struct rev_info *rev)
> */
> rev->max_count++;
> if (!rev->reflog_info) {
> - /* we allow cycles in reflog ancestry */
> + /*
> + * We may show a given commit multiple times when
> + * walking the reflogs.
> + */
> free_commit_buffer(commit);
> free_commit_list(commit->parents);
> commit->parents = NULL;
next prev parent reply other threads:[~2017-07-09 16:59 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
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 [this message]
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=xmqqtw2l8s22.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=e@80x24$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=kyle@kyleam$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sahildua2305@gmail$(echo .)com \
--cc=sandals@crustytoothpaste$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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