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: Thu, 2 Aug 2018 14:45:15 -0400 [thread overview]
Message-ID: <20180802184515.GC23690@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqeffj9ku3.fsf@gitster-ct.c.googlers.com>
On Tue, Jul 31, 2018 at 02:06:12PM -0700, Junio C Hamano wrote:
> 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
prev parent reply other threads:[~2018-08-02 18:45 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
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 [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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180802184515.GC23690@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).