git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>, "George Shammas" <georgyo@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git merge -s subtree seems to be broken.
Date: Tue, 31 Jul 2018 08:53:23 -0700	[thread overview]
Message-ID: <xmqqtvofcsgc.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CAF1Ko+FNfjWMteccfKDBjPEW76rGBLQkGb1icUHmzEZ0fKQJBA@mail.gmail.com> (George Shammas's message of "Tue, 31 Jul 2018 11:03:17 -0400")

George Shammas <georgyo@gmail.com> writes:

> Bisecting around, this might be the commit that introduced the breakage.
>
> https://github.com/git/git/commit/d8febde

Interesting.  I've never used the "-s subtree" strategy without
"-Xsubtree=..." to explicitly tell where the thing should go for a
long time, so I am not surprised if I did not notice if an update to
the heuristics made long time ago had affected tree matching.

d8febde3 ("match-trees: simplify score_trees() using tree_entry()",
2013-03-24) does touch the area that may affect the subtree matching
behaviour.

Because it is an update to heuristics, and as such, we need to be
careful when saying it is or is not "broken".  Some heuristics may
work better with your particular case, and may do worse with other
cases.

But from the log message description, it looks like it was meant to
be a no-op simplification rewrite that should not affect the outcome,
so it is a bit surprising.

  parent reply	other threads:[~2018-07-31 15:53 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 [this message]
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
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=xmqqtvofcsgc.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=georgyo@gmail.com \
    --cc=git@vger.kernel.org \
    --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).