From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH] commit: simplify building parents list
Date: Sun, 30 Oct 2016 16:03:06 -0700 [thread overview]
Message-ID: <xmqqd1ihv3rp.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <30afdbeb-7a45-70b2-495e-35fd3b62419a@web.de> ("René Scharfe"'s message of "Sat, 29 Oct 2016 14:55:36 +0200")
René Scharfe <l.s.r@web.de> writes:
> Push pptr down into the FROM_MERGE branch of the if/else statement,
> where it's actually used, and call commit_list_append() for appending
> elements instead of playing tricks with commit_list_insert(). Call
> copy_commit_list() in the amend branch instead of open-coding it. Don't
> bother setting pptr in the final branch as it's not used thereafter.
>
> Signed-off-by: Rene Scharfe <l.s.r@web.de>
> ---
> ...
> @@ -1729,7 +1727,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
> reflog_msg = (whence == FROM_CHERRY_PICK)
> ? "commit (cherry-pick)"
> : "commit";
> - pptr = &commit_list_insert(current_head, pptr)->next;
> + commit_list_insert(current_head, &parents);
> }
I needed to read the full preimage to determine why this hunk is
equivalent to the original. Which is a good demonstration that what
motivated this patch is a valid issue to tackle---initializing the
pptr variable to point at &parents too early and have the long
if/elseif/... cascade work with it made the code unnecessarily
harder to understand and this update untangles that.
Thanks.
prev parent reply other threads:[~2016-10-30 23:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-29 12:55 [PATCH] commit: simplify building parents list René Scharfe
2016-10-30 23:03 ` Junio C Hamano [this message]
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=xmqqd1ihv3rp.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
/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