From: Jeff King <peff@peff.net>
Date: Thu, 23 Apr 2015 20:10:19 GMT
Subject: Re: [PATCH] merge: simplify code flow
Message-ID: <20150423201019.GA28338@peff.net>
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