Re: 'upstream' branches.

From: Junio C Hamano <junkio@cox.net>
Date: May 6, 2007, 08:00 UTC
Message-ID: <7vy7k2e606.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <1178436926.17680.74.camel@shinybook.infradead.org>

David Woodhouse <dwmw2@infradead.org> writes:

Show 15 quoted lines

> 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.

Ahh, I did not mean by "mtd's idea" _your_ repository, but I meant whichever one that was overwriting your 'linus' tracking branch you are using to track fetch from Linus's tree.

The cleanest way to view "what do we really have since the latest of Linus, regardless of how and from whom we learned where the tip of Linus is", would be not to let other trees to disturb the tracking branch you use for Linus's tree with each other.

	[remote "a"] fetch = refs/heads/linus:refs/remotes/a/linus
	[remote "b"] fetch = refs/heads/linus:refs/remotes/b/linus
	[remote "c"] fetch = refs/heads/linus:refs/remotes/c/linus
	...

Then

	git log master --not remotes/a/linus remotes/b/linus remotes/c/linus

> Is that possible? I'm fairly sure it used to be.

I doubt we had that bug. If you allowed overwriting with +, it would not have prevented a rewind (i.e. pull from Linus and then pull from somebody who pulled from Linus earlier than you did). If you didn't, then it would have failed the fetch.