Re: [PATCH v4] contrib/subtree: fix "subtree split" skipped-merge bug

2015-12-08 Thread Eric Sunshine
On Tue, Dec 8, 2015 at 7:19 PM, Dave Ware wrote: > 'git subtree split' can incorrectly skip a merge even when both parents > act on the subtree, provided the merge results in a tree identical to > one of the parents. Fix by copying the merge if at least one parent is > non-identical, and the non-i

[PATCH v4] contrib/subtree: fix "subtree split" skipped-merge bug

2015-12-08 Thread Dave Ware
'git subtree split' can incorrectly skip a merge even when both parents act on the subtree, provided the merge results in a tree identical to one of the parents. Fix by copying the merge if at least one parent is non-identical, and the non-identical parent is not an ancestor of the identical parent