git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] merge: simplify code flow

From
Jeff King <peff@peff.net>
Date
Apr 23, 2015, 20:10 UTC
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:
Show 5 quoted lines
> 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
Previous: Junio C HamanoNext: Junio C Hamano
Message 2 of 3 in “merge: simplify code flow”
  1. merge: simplify code flowJunio C Hamano, Apr 23, 2015
  2. Jeff KingApr 23, 2015
  3. Junio C HamanoApr 23, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.