From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge: simplify code flow
Date: Thu, 23 Apr 2015 13:15:07 -0700 [thread overview]
Message-ID: <xmqqd22u38l0.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20150423201019.GA28338@peff.net> (Jeff King's message of "Thu, 23 Apr 2015 16:10:19 -0400")
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" ;-)
prev parent reply other threads:[~2015-04-23 20:15 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
2015-04-23 20:15 ` 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=xmqqd22u38l0.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.