Re: how to track multiple upstreams in one repository

["Ciprian Dorin, Craciun" <ciprian.craciun@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]

On Mon, Jan 19, 2009 at 5:58 AM,  <david@lang.hm> wrote:
> On Sun, 18 Jan 2009, Bryan Donlan wrote:
>
>> On Sun, Jan 18, 2009 at 06:58:06PM -0800, david@lang.hm wrote:
>>>
>>> for linux I want to track both the linus tree and the -stable tree.
>>> Ideally I want to be able to do a checkout of tags from either tree from
>>> the same directory (along with diffs between items in both trees, etc)
>>>
>>> I have found documentation on how to clone from each of them, but I
>>> haven't found any simple documentation on how to work with both of them.
>>
>> After cloning from one:
>> git remote add remotename git://...
>> git fetch remotename
>>
>> You will now have the other repository fetched into your local
>> repository; tags from both will be replicated to your local tags.
>
> thanks, given the nature of git I figured it was something really simple,
> but I just wasn't able to find it.
>
> I've forwarded this to the kernel.org webmaster to update the 'how to follow
> linux development' page
>
> David Lang

    I use something even simpler, please see the attached .git/config
file that I use. It also uses remote branches, and rewrites the refs
to something like: stable/v2.6.25/master or torvalds/v2.6/master. Also
in order to fetch them I use git fetch stable/v2.6.25

    Ciprian Craciun.

[-- Attachment #2: config --]
[-- Type: application/octet-stream, Size: 1772 bytes --]

[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true

[user]
	name = Ciprian Dorin Craciun
	email = ciprian.craciun@gmail.com

[url "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/"]
	insteadOf = torvalds:

[url "git://git.kernel.org/pub/scm/linux/kernel/git/stable/"]
	insteadOf = stable:

[remote "torvalds/v2.6"]
	url = torvalds:linux-2.6.git
	fetch = refs/heads/master:refs/heads/torvalds/v2.6/master

[remote "stable/v2.6.17"]
	url = stable:linux-2.6.17.y.git
	fetch = refs/heads/master:refs/heads/stable/v2.6.17/master

[remote "stable/v2.6.18"]
	url = stable:linux-2.6.18.y.git
	fetch = refs/heads/master:refs/heads/stable/v2.6.18/master

[remote "stable/v2.6.19"]
	url = stable:linux-2.6.19.y.git
	fetch = refs/heads/master:refs/heads/stable/v2.6.19/master

[remote "stable/v2.6.20"]
	url = stable:linux-2.6.20.y.git
	fetch = refs/heads/master:refs/heads/stable/v2.6.20/master

[remote "stable/v2.6.21"]
	url = stable:linux-2.6.21.y.git
	fetch = refs/heads/master:refs/heads/stable/v2.6.21/master

[remote "stable/v2.6.22"]
	url = stable:linux-2.6.22.y.git
	fetch = refs/heads/master:refs/heads/stable/v2.6.22/master

[remote "stable/v2.6.23"]
	url = stable:linux-2.6.23.y.git
	fetch = refs/heads/master:refs/heads/stable/v2.6.23/master

[remote "stable/v2.6.24"]
	url = stable:linux-2.6.24.y.git
	fetch = refs/heads/master:refs/heads/stable/v2.6.24/master

[remote "stable/v2.6.25"]
	url = stable:linux-2.6.25.y.git
	fetch = refs/heads/master:refs/heads/stable/v2.6.25/master

[remote "stable/v2.6.26"]
	url = stable:linux-2.6.26.y.git
	fetch = refs/heads/master:refs/heads/stable/v2.6.26/master

[remote "stable/v2.6.27"]
	url = stable:linux-2.6.27.y.git
	fetch = refs/heads/master:refs/heads/stable/v2.6.27/master