git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Bug? Subtree merge seems to choke on trailing slashes.

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 14, 2012, 20:11 UTC
Message-ID
<7vvcd89c6x.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CA+6di1nsWOGXjchOc3SZ2FL79zGzgNqjOJyN0zf8Yb8GbXCpbA@mail.gmail.com>
"Jack O'Connor" <oconnor663@gmail.com> writes:
> Do I have the right list for bug reports? Apologies if not.
Yes.
Show 7 quoted lines
> 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.

Previous: Jack O'Connor
Message 3 of 3 in “Bug? Subtree merge seems to choke on trailing slashes.”
  1. Jack O'ConnorNov 7, 2012
  2. Jack O'ConnorNov 14, 2012
  3. Junio C HamanoNov 14, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.