On Tue, Dec 8, 2015 at 7:19 PM, Dave Ware <davidw@xxxxxxxxxxxxxxxxxxxx> 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-identical parent is not an ancestor of the > identical parent. > > Also, add a test case which checks that a descendant can be pushed to > its ancestor in this case. > > Signed-off-by: Dave Ware <davidw@xxxxxxxxxxxxxxxxxxxx> > --- > diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh > @@ -468,4 +468,56 @@ test_expect_success 'verify one file change per commit' ' > )) > ' > > +test_expect_success 'subtree descendent check' ' s/descendent/descendant/ > + mkdir git_subtree_split_check && > + ( > + cd git_subtree_split_check && > +[...] > + git push . subtree_tip:subtree_branch > + ) > + ' Style nit: don't indent closing quotation mark > test_done > -- > 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html