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

"Jack O'Connor" [off-list ref] 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 [off-list ref] wrote:

quoted

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.