From: Eric Sunshine Date: Fri, 15 Jan 2016 23:24:26 GMT Subject: Re: [PATCH v7] contrib/subtree: fix "subtree split" skipped-merge bug Message-ID: In-Reply-To: On Fri, Jan 15, 2016 at 1:58 PM, Junio C Hamano wrote: > Dave Ware writes: >> '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 remains a >> descendent on the subtree in this case. >> >> Signed-off-by: Dave Ware >> --- > > David, how does this round look? Can we proceed with your (and Eric's) > Reviewed-by: with this version (with one grammo fix Eric pointed out)? As I'm not a subtree user, I'm not qualified to give a Reviewed-by:; my review comments were general, not specific to subtree functionality. At best, that might qualify for a Helped-by: if my comments had any value.