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

Re: [PATCH] merge: simplify code flow

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 23, 2015, 20:15 UTC
Message-ID
<xmqqd22u38l0.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20150423201019.GA28338@peff.net>
Jeff King <peff@peff.net> writes:
> Yeah, this looks obviously correct.

It is funny that this dates back to the very beginning of defaulting to the upstream, the code that "if ()" block implements, introduced at 93e535a5 (merge: merge with the default upstream branch without argument, 2011-03-23).

> 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.

Reading "git show 93e535a5" output, I see that it is a more recent "breakage" ;-)

Previous: Jeff King
Message 3 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.