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

2015-12-07 Thread Eric Sunshine
On Mon, Dec 7, 2015 at 3:50 PM, Dave Ware <dav...@realtimegenomics.com> wrote: > [PATCH] contrib/subtree: fix "subtree split" skipped-merge bug. As an aid for reviewers, please indicate the version of this patch submission. For instance, this is the second attempt, s

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

2015-12-07 Thread Dave Ware
A bug occurs in 'git-subtree split' where a merge is skipped 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