Re: git subtree bug produces divergent descendants

2015-12-07 Thread David Ware
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

2015-12-06 Thread David Ware
Sorry for the double post, I received a mail blocking notification message (due to the attached .sh file) and erroneously thought this message had been blocked from the entire list. My later one includes the test case as part of the attached patch. Cheers, Dave Ware On Mon, Dec 7, 2015 at 9:41

git subtree bug produces divergent descendants

2015-12-06 Thread David Ware
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

2015-12-06 Thread David Ware
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

Re: git subtree bug produces divergent descendants

2015-12-06 Thread Eric Sunshine
On Mon, Dec 07, 2015 at 11:09:48AM +1300, David Ware 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). [...] I'm not a