Re: GIT and the current -stable

2007-04-14 Thread Julian Phillips
On Sun, 15 Apr 2007, Rene Herman wrote: "v2.6.20.7" seems to be the only tag from the stable branches that's present in this tree? [EMAIL PROTECTED]:[...]$ git tag -l | grep "v2\.6\.[[:digit:]]\{1,2\}\." v2.6.20.7 Obviously I don't know how Chris created his conglomerated repo, but I just

Re: GIT and the current -stable

2007-04-14 Thread Rene Herman
On 04/14/2007 10:54 AM, Rene Herman wrote: On 04/14/2007 10:34 AM, Chris Wright wrote: I've already put a tree like this up on kernel.org. The master branch is Linus' tree, and there's branches for each of the stable releases called linux-2.6.[12-20].y (I didn't add 2.6.11.y).

Re: GIT and the current -stable

2007-04-14 Thread Julian Phillips
On Sat, 14 Apr 2007, Chris Wright wrote: * Brian Gernhardt ([EMAIL PROTECTED]) wrote: On Apr 14, 2007, at 4:34 AM, Chris Wright wrote: I've already put a tree like this up on kernel.org. The master branch is Linus' tree, and there's branches for each of the stable releases called

Re: GIT and the current -stable

2007-04-14 Thread Gerb Stralko
Please don't do this. Using the same name for a branch as for a tag is madness. Call it "v2.6.20-stable" or anything else, but don't re-use the same naming as for tags. Yes I have done this before, and it took me awhile to realize what was going on. It caused me some grief, and a few hours of

Re: GIT and the current -stable

2007-04-14 Thread Linus Torvalds
On Fri, 13 Apr 2007, Junio C Hamano wrote: > > I think adding these lines to .git/config would do the trick, > after you have done the "checkout -b v2.6.20 v2.6.20" step: > > [branch "v2.6.20"] > remote = stable > merge = refs/heads/master Please don't do this. Using the same name

Re: GIT and the current -stable

2007-04-14 Thread Chris Wright
* Brian Gernhardt ([EMAIL PROTECTED]) wrote: > Hm. I should drink my coffee, then read the mailing list, not the > other way around. If you do update HEAD to be the most recent > stable, my thanks. Apologies for the noise. No problem, was a good suggestion (and it's done). thanks, -chris

Re: GIT and the current -stable

2007-04-14 Thread Brian Gernhardt
On Apr 14, 2007, at 1:19 PM, Chris Wright wrote: As I mentioned. The master branch (HEAD) is Linus' tree, and each stable tree is on its own branch. Hm. I should drink my coffee, then read the mailing list, not the other way around. If you do update HEAD to be the most recent stable,

Re: GIT and the current -stable

2007-04-14 Thread Chris Wright
* Brian Gernhardt ([EMAIL PROTECTED]) wrote: > On Apr 14, 2007, at 4:34 AM, Chris Wright wrote: > >I've already put a tree like this up on kernel.org. The master branch > >is Linus' tree, and there's branches for each of the stable releases > >called linux-2.6.[12-20].y (I didn't add 2.6.11.y). >

Re: GIT and the current -stable

2007-04-14 Thread Brian Gernhardt
On Apr 14, 2007, at 4:34 AM, Chris Wright wrote: I've already put a tree like this up on kernel.org. The master branch is Linus' tree, and there's branches for each of the stable releases called linux-2.6.[12-20].y (I didn't add 2.6.11.y).

Re: GIT and the current -stable

2007-04-14 Thread Uwe Kleine-König
Hello Rene, Rene Herman wrote: > each time that a new -stable is released. Rather though, I'd like a simple > "git pull" to do this while on this branch while a "git pull" while back on > the master branch pulls from the originally cloned Linus repo again. > > Is this possible? Do I want it to

Re: GIT and the current -stable

2007-04-14 Thread Rene Herman
On 04/14/2007 10:34 AM, Chris Wright wrote: I've already put a tree like this up on kernel.org. The master branch is Linus' tree, and there's branches for each of the stable releases called linux-2.6.[12-20].y (I didn't add 2.6.11.y).

Re: GIT and the current -stable

2007-04-14 Thread Chris Wright
torvalds/linux-2.6.git local > > I then branch off a 2.6.20 branch: > > cd local > git checkout -b v2.6.20 v2.6.20 > > to now update to the current -stable I could do: > > git pull \ > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git I'

Re: GIT and the current -stable

2007-04-14 Thread Greg KH
of Linus current: > > > > git clone \ > > git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git > > local > > > > I then branch off a 2.6.20 branch: > > > > cd local > > git checkout -b v2.6.20 v2.6.20 > > > > to now upd

Re: GIT and the current -stable

2007-04-14 Thread Rene Herman
On 04/14/2007 08:24 AM, Junio C Hamano wrote: I think adding these lines to .git/config would do the trick, after you have done the "checkout -b v2.6.20 v2.6.20" step: [branch "v2.6.20"] remote = stable merge = refs/heads/master [remote "stable"] url =

Re: GIT and the current -stable

2007-04-14 Thread Junio C Hamano
t/torvalds/linux-2.6.git > local > > I then branch off a 2.6.20 branch: > > cd local > git checkout -b v2.6.20 v2.6.20 > > to now update to the current -stable I could do: > > git pull \ > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git I t

Re: GIT and the current -stable

2007-04-14 Thread Junio C Hamano
then branch off a 2.6.20 branch: cd local git checkout -b v2.6.20 v2.6.20 to now update to the current -stable I could do: git pull \ git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git I think adding these lines to .git/config would do the trick, after you have done

Re: GIT and the current -stable

2007-04-14 Thread Rene Herman
On 04/14/2007 08:24 AM, Junio C Hamano wrote: I think adding these lines to .git/config would do the trick, after you have done the checkout -b v2.6.20 v2.6.20 step: [branch v2.6.20] remote = stable merge = refs/heads/master [remote stable] url =

Re: GIT and the current -stable

2007-04-14 Thread Greg KH
://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git local I then branch off a 2.6.20 branch: cd local git checkout -b v2.6.20 v2.6.20 to now update to the current -stable I could do: git pull \ git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git

Re: GIT and the current -stable

2007-04-14 Thread Chris Wright
local I then branch off a 2.6.20 branch: cd local git checkout -b v2.6.20 v2.6.20 to now update to the current -stable I could do: git pull \ git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git I've already put a tree like this up on kernel.org. The master branch

Re: GIT and the current -stable

2007-04-14 Thread Rene Herman
On 04/14/2007 10:34 AM, Chris Wright wrote: I've already put a tree like this up on kernel.org. The master branch is Linus' tree, and there's branches for each of the stable releases called linux-2.6.[12-20].y (I didn't add 2.6.11.y).

Re: GIT and the current -stable

2007-04-14 Thread Uwe Kleine-König
Hello Rene, Rene Herman wrote: each time that a new -stable is released. Rather though, I'd like a simple git pull to do this while on this branch while a git pull while back on the master branch pulls from the originally cloned Linus repo again. Is this possible? Do I want it to be?

Re: GIT and the current -stable

2007-04-14 Thread Brian Gernhardt
On Apr 14, 2007, at 4:34 AM, Chris Wright wrote: I've already put a tree like this up on kernel.org. The master branch is Linus' tree, and there's branches for each of the stable releases called linux-2.6.[12-20].y (I didn't add 2.6.11.y).

Re: GIT and the current -stable

2007-04-14 Thread Chris Wright
* Brian Gernhardt ([EMAIL PROTECTED]) wrote: On Apr 14, 2007, at 4:34 AM, Chris Wright wrote: I've already put a tree like this up on kernel.org. The master branch is Linus' tree, and there's branches for each of the stable releases called linux-2.6.[12-20].y (I didn't add 2.6.11.y).

Re: GIT and the current -stable

2007-04-14 Thread Brian Gernhardt
On Apr 14, 2007, at 1:19 PM, Chris Wright wrote: As I mentioned. The master branch (HEAD) is Linus' tree, and each stable tree is on its own branch. Hm. I should drink my coffee, then read the mailing list, not the other way around. If you do update HEAD to be the most recent stable,

Re: GIT and the current -stable

2007-04-14 Thread Chris Wright
* Brian Gernhardt ([EMAIL PROTECTED]) wrote: Hm. I should drink my coffee, then read the mailing list, not the other way around. If you do update HEAD to be the most recent stable, my thanks. Apologies for the noise. No problem, was a good suggestion (and it's done). thanks, -chris -

Re: GIT and the current -stable

2007-04-14 Thread Linus Torvalds
On Fri, 13 Apr 2007, Junio C Hamano wrote: I think adding these lines to .git/config would do the trick, after you have done the checkout -b v2.6.20 v2.6.20 step: [branch v2.6.20] remote = stable merge = refs/heads/master Please don't do this. Using the same name for a

Re: GIT and the current -stable

2007-04-14 Thread Gerb Stralko
Please don't do this. Using the same name for a branch as for a tag is madness. Call it v2.6.20-stable or anything else, but don't re-use the same naming as for tags. Yes I have done this before, and it took me awhile to realize what was going on. It caused me some grief, and a few hours of

Re: GIT and the current -stable

2007-04-14 Thread Julian Phillips
On Sat, 14 Apr 2007, Chris Wright wrote: * Brian Gernhardt ([EMAIL PROTECTED]) wrote: On Apr 14, 2007, at 4:34 AM, Chris Wright wrote: I've already put a tree like this up on kernel.org. The master branch is Linus' tree, and there's branches for each of the stable releases called

Re: GIT and the current -stable

2007-04-14 Thread Rene Herman
On 04/14/2007 10:54 AM, Rene Herman wrote: On 04/14/2007 10:34 AM, Chris Wright wrote: I've already put a tree like this up on kernel.org. The master branch is Linus' tree, and there's branches for each of the stable releases called linux-2.6.[12-20].y (I didn't add 2.6.11.y).

Re: GIT and the current -stable

2007-04-14 Thread Julian Phillips
On Sun, 15 Apr 2007, Rene Herman wrote: v2.6.20.7 seems to be the only tag from the stable branches that's present in this tree? [EMAIL PROTECTED]:[...]$ git tag -l | grep v2\.6\.[[:digit:]]\{1,2\}\. v2.6.20.7 Obviously I don't know how Chris created his conglomerated repo, but I just

GIT and the current -stable

2007-04-13 Thread Rene Herman
branch: cd local git checkout -b v2.6.20 v2.6.20 to now update to the current -stable I could do: git pull \ git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git each time that a new -stable is released. Rather though, I'd like a simple "git pull" to do

GIT and the current -stable

2007-04-13 Thread Rene Herman
branch: cd local git checkout -b v2.6.20 v2.6.20 to now update to the current -stable I could do: git pull \ git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.20.y.git each time that a new -stable is released. Rather though, I'd like a simple git pull to do this while