On Sat, 2007-05-05 at 23:36 -0700, Junio C Hamano wrote:
> I think David's use of linus ref is bogus. What is he really
> trying to "track"? If he is trying to track where the tip of
> Linus's tree is, he should not let fetch from mtd to muck with
> that remote tracking ref that he uses to track Linus's tree.
I'm trying to track "the latest commit in this tree which comes from
Linus, either directly or indirectly".
So that 'git-diff linus..' or 'git-log linus..' will show me what's
outstanding against the master('s) tree. And scripts feeding the commits
list can ignore those commits, etc.
> On the other hand, I think it is perfectly reasonable thing to
> want to track where the tip of Linus's tree is "from mtd tree's
> point of view". Then diff between "mtd's idea of Linus's tip"
> and "mtd's tip" would represent what mtd people did, regardless
> of what Linus did in his tree, before mtd people had a chance to
> sync again with Linus.
Right. That's what I'm trying to track. And that 'idea of Linus' tip'
needs to get updated whenever we pull from Linus' tree into our
mtd-2.6.git tree on the server -- by whatever route, even if it's
indirectly through another repo.
Obviously we never actually _work_ on the tree on the server; we only
ever push to it from a working repo somewhere.
So those working repositories need to have this 'linus' branch which is
updated when they pull directly from kernel.org, and which is pushed to
the mtd tree when they push.
Furthermore, when unprivileged users create their own clone with commits
they want me to push, and if _they_ also pull from Linus' tree for some
reason, that information should also make it into my working repo when I
pull, and then into the mtd-2.6.git tree when I push. Those unprivileged
users will probably want an 'mtd' branch too, to keep track of their
_own_ outstanding changes.
And when we do other things like the olpc-2.6.git tree ,which pulls from
various other repositories (mtd, mmc, etc.), it should use the 'linus'
branches of each of those repositories we pull from.
Is that possible? I'm fairly sure it used to be.
--
dwmw2
-
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