Re: git merge -s subtree seems to be broken.

This is the fastest I ever seen an open source project respond to an issue I reported. Thanks for being awesome! On Tue, Jul 31, 2018 at 3:05 PM Jeff King wrote: > On Tue, Jul 31, 2018 at 01:23:04PM -0400, Jeff King wrote: > > > On Tue, Jul 31, 2018 at 10:17:15AM -0700, Junio C Hamano wrote: >

Re: git merge -s subtree seems to be broken.

While debugging this, I did try -X subtree=src/ however the effect was the same. On Tue, Jul 31, 2018 at 11:53 AM Junio C Hamano wrote: > George Shammas writes: > > > Bisecting around, this might be the commit that introduced the breakage. > > > > https://github.co

Re: git merge -s subtree seems to be broken.

Bisecting around, this might be the commit that introduced the breakage. https://github.com/git/git/commit/d8febde I really hope that it hasn't been broken for 5 years and I am just doing something wrong. On Tue, Jul 31, 2018 at 10:09 AM George Shammas wrote: > At work, we recently upda

git merge -s subtree seems to be broken.

At work, we recently updated from a massively old version of git (1.7.10) to 2.18. There are a few code bases that use subtrees, and they seem to have completely broke when trying to merge in updates. I have confirmed that it works correctly in 1.7.10. The 2.18 behavior is clearly incorrect.