From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "René Scharfe" <l.s.r@web.de>,
"George Shammas" <georgyo@gmail.com>,
git@vger.kernel.org
Subject: Re: git merge -s subtree seems to be broken.
Date: Tue, 31 Jul 2018 13:23:04 -0400 [thread overview]
Message-ID: <20180731172304.GA16977@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqh8kfcokk.fsf@gitster-ct.c.googlers.com>
On Tue, Jul 31, 2018 at 10:17:15AM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > +...
> > + } else if (cmp > 0) {
> > /* path2 does not appear in one */
> > + score += score_missing(two.entry.mode, two.entry.path);
> > + update_tree_entry(&two);
> > + continue;
> > + } if (oidcmp(one.entry.oid, two.entry.oid)) {
>
> As the earlier ones do the "continue at the end of the block", this
> does not affect the correctness, but I think you either meant "else if"
> or a fresh "if/else" that is disconnected from the previous if/else if/...
> chain.
Yes, thanks. I actually started to write it without the "continue" at
all, and a big "else" that checked the "we have both" case. But I backed
that out (in favor of a smaller diff), and forgot to add back in the
"else if".
-Peff
next prev parent reply other threads:[~2018-07-31 17:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-31 14:09 git merge -s subtree seems to be broken George Shammas
2018-07-31 15:03 ` George Shammas
2018-07-31 15:50 ` Jeff King
2018-07-31 16:08 ` Junio C Hamano
2018-08-01 0:58 ` René Scharfe
2018-07-31 15:53 ` Junio C Hamano
2018-07-31 15:56 ` George Shammas
2018-07-31 16:15 ` Jeff King
2018-07-31 17:17 ` Junio C Hamano
2018-07-31 17:23 ` Jeff King [this message]
2018-07-31 19:04 ` Jeff King
2018-07-31 19:52 ` George Shammas
2018-07-31 20:40 ` Jeff King
2018-07-31 21:06 ` Junio C Hamano
2018-08-01 0:58 ` René Scharfe
2018-08-02 18:58 ` Jeff King
2018-08-02 18:45 ` Jeff King
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=20180731172304.GA16977@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=georgyo@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).