From: Jeff King <peff@peff•net>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] merge: simplify code flow
Date: Thu, 23 Apr 2015 16:10:19 -0400 [thread overview]
Message-ID: <20150423201019.GA28338@peff.net> (raw)
In-Reply-To: <xmqqh9s6397b.fsf@gitster.dls.corp.google.com>
On Thu, Apr 23, 2015 at 01:01:44PM -0700, Junio C Hamano wrote:
> One of the first things cmd_merge() does is to see if the "--abort"
> option is given and run "reset --merge" and exit. When the control
> reaches this point, we know "--abort" was not given.
>
> Signed-off-by: Junio C Hamano <gitster@pobox•com>
Yeah, this looks obviously correct.
As an aside, the fact that the actual "if (abort_current_merge)"
conditional ends with a "goto" to a cleanup label that is 500 lines away
is...kind of gross.
-Peff
next prev parent reply other threads:[~2015-04-23 20:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-23 20:01 [PATCH] merge: simplify code flow Junio C Hamano
2015-04-23 20:10 ` Jeff King [this message]
2015-04-23 20:15 ` 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=20150423201019.GA28338@peff.net \
--to=peff@peff$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/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