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

On Wed, Dec 9, 2015 at 10:23 AM, Junio C Hamano wrote: > Dave Ware writes: > >> 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

Re: git subtree bug produces divergent descendants

Thanks for taking the time to look over it. I'm not familiar with the process here. On Mon, Dec 7, 2015 at 5:53 PM, Eric Sunshine wrote: > Tests don't automatically return to the directory prior to the 'cd', > so when this test ends, the current directory will still be >

Re: git subtree bug produces divergent descendants

AM, David Ware <dav...@realtimegenomics.com> wrote: > My group has run into a bug with "git-subtree split". Under some > circumstances a split created from a descendant of another earlier > split is not a descendant of that earlier split (thus blocking > pushes). We origi

git subtree bug produces divergent descendants

My group has run into a bug with "git-subtree split". Under some circumstances a split created from a descendant of another earlier split is not a descendant of that earlier split (thus blocking pushes). We originally noticed this on v1.9.1 but have also checked it on v2.6.3 When scanning the

git subtree bug produces divergent descendants

My group has run into a bug with "git-subtree split". Under some circumstances a split created from a descendant of another earlier split is not a descendant of that earlier split (thus blocking pushes). We originally noticed this on v1.9.1 but have also checked it on v2.6.3 When scanning the