From: Junio C Hamano <gitster@pobox.com>
To: "Jack O'Connor" <oconnor663@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: Bug? Subtree merge seems to choke on trailing slashes.
Date: Wed, 14 Nov 2012 12:11:50 -0800 [thread overview]
Message-ID: <7vvcd89c6x.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CA+6di1nsWOGXjchOc3SZ2FL79zGzgNqjOJyN0zf8Yb8GbXCpbA@mail.gmail.com> (Jack O'Connor's message of "Tue, 13 Nov 2012 18:17:03 -0800")
"Jack O'Connor" <oconnor663@gmail.com> writes:
> Do I have the right list for bug reports? Apologies if not.
Yes.
> On Tue, Nov 6, 2012 at 5:58 PM, Jack O'Connor <oconnor663@gmail.com> wrote:
>>
>> 2) I try to merge more upstream changes on top of that with the
>> following command:
>> git merge --strategy-option=subtree='test/' $upstream_stuff
>> 3) Git fails with an obscure error:
>> fatal: entry not found in tree daf4d0f0a20b8b6ec007be9fcafeac84a6eba4f0
I'd expect --strategy-option=subtree=./test, ././test (or ./test/
for that matter) would fail in a similar way, too.
What happens if you do not give an unnecessary '/' at the end?
If it works, I'd say that it falls into "dr. it hurts when I twist
my arm this way---don't do it then" category.
prev parent reply other threads:[~2012-11-14 20:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-07 1:58 Bug? Subtree merge seems to choke on trailing slashes Jack O'Connor
2012-11-14 2:17 ` Jack O'Connor
2012-11-14 20:11 ` 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=7vvcd89c6x.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=oconnor663@gmail.com \
/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).