Re: git merge -s subtree seems to be broken.

From: Jeff King <peff@peff.net>
Date: Aug 2, 2018, 18:45 UTC
Message-ID: <20180802184515.GC23690@sigill.intra.peff.net>
In-Reply-To: <xmqqeffj9ku3.fsf@gitster-ct.c.googlers.com>

On Tue, Jul 31, 2018 at 02:06:12PM -0700, Junio C Hamano wrote:

Show 11 quoted lines

> Jeff King <peff@peff.net> writes:
> 
> > On Tue, Jul 31, 2018 at 01:23:04PM -0400, Jeff King wrote:
> > ...
> > So here it is fixed, and with a commit message. I'm not happy to omit a
> > regression test, but I actually couldn't come up with a minimal one that
> > tickled the problem, because we're playing around with heuristics. So I
> > compensated by probably over-explaining in the commit message. But
> 
> Have you tried to apply the message yourself?  I'll fix it up but
> the hint to answer that question is in two extra pair of scissors.

Heh, thank you for noticing. I actually wondered about that while writing it and meant to test, but then got distracted.

I wonder "am --scissors" should actually look for the _first_ scissors. I guess that has the opposite problem, which is that we might include too much cruft in an email that uses scissors. Perhaps "too much" is a better failure mode than "too little", though.

-Peff