Re: git-subtree.sh - regression introduced by da949cc55

On Fri, Feb 12, 2010 at 18:52, Avery Pennarun <apenwarr@gmail.com> wrote:

It's true, when you try to extract a subproject from an ordinary directory of a project, using git subtree split, it builds the new branch on top of some past commit, instead of as a completely separate timeline, and it's exactly because of my change. The problem lies in what you wrote in the comment above that fragment: "ugly. is there no better way to tell if this is a subtree vs. a mainline commit? Does it matter?" - well, apparently it does matter :) That line fixed my problem, because commits in the subproject's timeline should have cache set to themselves, but it the case when you start from the other side (first subtree split, not first subtree add), in this fragment the first commits from the mainline (which are unrelated to the subdirectory) are regarded as subtree commits, because $tree is empty (but not because the root directory is different, only because it just didn't exist yet at this point).

We just need some different way of determining if this is a commit from subtree timeline or the main timeline - I'll see if I can come up with something...

JS