{"thread":{"id":"32034","subject":"Bug? Subtree merge seems to choke on trailing slashes.","startedAt":"2012-11-07T01:58:34Z","lastAt":"2012-11-14T20:11:50Z","messageCount":3,"participants":["Jack O'Connor","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"202609","messageId":"CA+6di1m7OCMjahP9sN3NcYdxLRRi4vmttFa5=pnHrgKp=E4+jQ@mail.gmail.com","threadId":"32034","inReplyTo":null,"subject":"Bug? Subtree merge seems to choke on trailing slashes.","fromName":"Jack O'Connor","fromEmail":"oconnor663@gmail.com","sentAt":"2012-11-07T01:58:34Z","receivedAt":"2012-11-07T01:58:34Z","isPatch":false,"sender":{"key":"oconnor663@gmail.com","avatar":"https://gravatar.com/avatar/221557916c71e91c6adf326e4fcc9c8bd71dd4b855a7a2ad670107ff7155330d?d=mp&s=160"},"body":"I'm summarizing from here:\nhttp://stackoverflow.com/questions/5904256/git-subtree-merge-into-a-deeply-nested-subdirectory\n\nQuick repro:\n1) I do an initial subtree merge in what I think is the standard way\n(http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html).\nMy prefix is simply \"test/\".\n2) I try to merge more upstream changes on top of that with the\nfollowing command:\ngit merge --strategy-option=subtree='test/' $upstream_stuff\n3) Git fails with an obscure error:\nfatal: entry  not found in tree daf4d0f0a20b8b6ec007be9fcafeac84a6eba4f0\n\nIf I remove the trailing slash from the command in step 2, it works just fine:\ngit merge --strategy-option=subtree='test' $upstream_stuff\n\nNote in the error message above, there's a double space after \"entry\".\nIs it looking for a tree with an empty name? Did my trailing slash\nimply a directory named empty-string?\n\nThanks for your help.\n\n-- Jack O'Connor\n"},{"id":"203167","messageId":"CA+6di1nsWOGXjchOc3SZ2FL79zGzgNqjOJyN0zf8Yb8GbXCpbA@mail.gmail.com","threadId":"32034","inReplyTo":"CA+6di1m7OCMjahP9sN3NcYdxLRRi4vmttFa5=pnHrgKp=E4+jQ@mail.gmail.com","subject":"Re: Bug? Subtree merge seems to choke on trailing slashes.","fromName":"Jack O'Connor","fromEmail":"oconnor663@gmail.com","sentAt":"2012-11-14T02:17:03Z","receivedAt":"2012-11-14T02:17:03Z","isPatch":false,"sender":{"key":"oconnor663@gmail.com","avatar":"https://gravatar.com/avatar/221557916c71e91c6adf326e4fcc9c8bd71dd4b855a7a2ad670107ff7155330d?d=mp&s=160"},"body":"Do I have the right list for bug reports? Apologies if not.\n\nOn Tue, Nov 6, 2012 at 5:58 PM, Jack O'Connor <oconnor663@gmail.com> wrote:\n>\n> I'm summarizing from here:\n> http://stackoverflow.com/questions/5904256/git-subtree-merge-into-a-deeply-nested-subdirectory\n>\n> Quick repro:\n> 1) I do an initial subtree merge in what I think is the standard way\n> (http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html).\n> My prefix is simply \"test/\".\n> 2) I try to merge more upstream changes on top of that with the\n> following command:\n> git merge --strategy-option=subtree='test/' $upstream_stuff\n> 3) Git fails with an obscure error:\n> fatal: entry  not found in tree daf4d0f0a20b8b6ec007be9fcafeac84a6eba4f0\n>\n> If I remove the trailing slash from the command in step 2, it works just fine:\n> git merge --strategy-option=subtree='test' $upstream_stuff\n>\n> Note in the error message above, there's a double space after \"entry\".\n> Is it looking for a tree with an empty name? Did my trailing slash\n> imply a directory named empty-string?\n>\n> Thanks for your help.\n>\n> -- Jack O'Connor\n"},{"id":"203220","messageId":"7vvcd89c6x.fsf@alter.siamese.dyndns.org","threadId":"32034","inReplyTo":"CA+6di1nsWOGXjchOc3SZ2FL79zGzgNqjOJyN0zf8Yb8GbXCpbA@mail.gmail.com","subject":"Re: Bug? Subtree merge seems to choke on trailing slashes.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-11-14T20:11:50Z","receivedAt":"2012-11-14T20:11:50Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Jack O'Connor\" <oconnor663@gmail.com> writes:\n\n> Do I have the right list for bug reports? Apologies if not.\n\nYes.\n\n> On Tue, Nov 6, 2012 at 5:58 PM, Jack O'Connor <oconnor663@gmail.com> wrote:\n>>\n>> 2) I try to merge more upstream changes on top of that with the\n>> following command:\n>> git merge --strategy-option=subtree='test/' $upstream_stuff\n>> 3) Git fails with an obscure error:\n>> fatal: entry  not found in tree daf4d0f0a20b8b6ec007be9fcafeac84a6eba4f0\n\nI'd expect --strategy-option=subtree=./test, ././test (or ./test/\nfor that matter) would fail in a similar way, too.\n\nWhat happens if you do not give an unnecessary '/' at the end?\n\nIf it works, I'd say that it falls into \"dr. it hurts when I twist\nmy arm this way---don't do it then\" category.\n"}]}