threads / discuss / 2876

using-topic-branches.txt

Subject: using-topic-branches.txt

## tl;dr

8 messages between Dec 19, 2005 and Dec 19, 2005.

replies: 7people: 6as markdown or json

Brown, Len· Dec 19, 2005, 04:13 UTC · lore

Show 24 quoted lines

> file:4698abe46bff0b878dcfcd05771f5760483b4278 -> file:494429738f8f86bbe21f38b5f90cc94344ad0630
> --- a/Documentation/howto/using-topic-branches.txt
> +++ b/Documentation/howto/using-topic-branches.txt
> @@ -31,7 +31,7 @@ test tree and then pull to the release t
> patches blocked in the test tree waiting for complex changes to accumulate
> enough test time to graduate.
> -Back in the BitKeeper days I achieved this my creating small forests of
> +Back in the BitKeeper days I achieved this by creating small forests of
> temporary trees, one tree for each logical grouping of patches, and then
> pulling changes from these trees first to the test tree, and then to the
> release tree. At first I replicated this in GIT, but then I realised
> @@ -42,7 +42,8 @@ So here is the step-by-step guide how th
> First create your work tree by cloning Linus's public tree:
> - $ git clone rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
> + $ git clone \
> + master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
> Change directory into the cloned tree you just created
> @@ -52,7 +53,7 @@ Set up a remotes file so that you can fe
> branch into a local branch named "linus":
> $ cat > .git/remotes/linus
> - URL: rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> + URL: master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> Pull: master:linus
> ^D

This works for me, but now it requires a password to update when before it did not.

-Len

Jeff Garzik· Dec 19, 2005, 04:52 UTC · re: Brown, Len · lore

Re: using-topic-branches.txt

Brown, Len wrote:

Show 28 quoted lines

>>file:4698abe46bff0b878dcfcd05771f5760483b4278 -> file:494429738f8f86bbe21f38b5f90cc94344ad0630
>>--- a/Documentation/howto/using-topic-branches.txt
>>+++ b/Documentation/howto/using-topic-branches.txt
>>@@ -31,7 +31,7 @@ test tree and then pull to the release t
>>patches blocked in the test tree waiting for complex changes to accumulate
>>enough test time to graduate.
>>-Back in the BitKeeper days I achieved this my creating small forests of
>>+Back in the BitKeeper days I achieved this by creating small forests of
>>temporary trees, one tree for each logical grouping of patches, and then
>>pulling changes from these trees first to the test tree, and then to the
>>release tree. At first I replicated this in GIT, but then I realised
>>@@ -42,7 +42,8 @@ So here is the step-by-step guide how th
>>First create your work tree by cloning Linus's public tree:
>>- $ git clone rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
>>+ $ git clone \
>>+ master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
>>Change directory into the cloned tree you just created
>>@@ -52,7 +53,7 @@ Set up a remotes file so that you can fe
>>branch into a local branch named "linus":
>>$ cat > .git/remotes/linus
>>- URL: rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
>>+ URL: master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
>>Pull: master:linus
>>^D
> 
> 
> This works for me, but now it requires a password to update
> when before it did not.

master.kernel.org is non-public, so it shouldn't be mentioned in documentation...

	Jeff

Junio C Hamano· Dec 19, 2005, 05:33 UTC · re: Jeff Garzik · lore

Re: using-topic-branches.txt

Jeff Garzik <jgarzik@pobox.com> writes:

> master.kernel.org is non-public, so it shouldn't be mentioned in 
> documentation...

I'm willing to be persuaded otherwise, but the reason I changed this part was twofold:

 - The documentation is meant to be an example for subsystem
   maintainers, who are "non-public" people anyway.

 - Linus publicly stated number of times that he fulfils the
   pull requests to him by pulling from master --- this avoids
   mirroring lag.  Not slowing down subsystem maintainers
   waiting for mirroring lag would equally be a good idea, I
   thought.

J. Bruce Fields· Dec 19, 2005, 15:55 UTC · re: Junio C Hamano · lore

Re: using-topic-branches.txt

On Sun, Dec 18, 2005 at 09:33:17PM -0800, Junio C Hamano wrote:

Show 10 quoted lines

> Jeff Garzik <jgarzik@pobox.com> writes:
> 
> > master.kernel.org is non-public, so it shouldn't be mentioned in 
> > documentation...
> 
> I'm willing to be persuaded otherwise, but the reason I changed
> this part was twofold:
> 
>  - The documentation is meant to be an example for subsystem
>    maintainers, who are "non-public" people anyway.

There are people without kernel.org accounts who do similar sorts of work.

--b.

H. Peter Anvin· Dec 19, 2005, 22:24 UTC · re: Junio C Hamano · lore

Re: using-topic-branches.txt

Junio C Hamano wrote:

Show 6 quoted lines

> Jeff Garzik <jgarzik@pobox.com> writes:
> 
>>master.kernel.org is non-public, so it shouldn't be mentioned in 
>>documentation...
> 
> I'm willing to be persuaded otherwise

We want to publicize this machine as little as possible. Please don't make it worse than necessary.

	-hpa

Junio C Hamano· Dec 19, 2005, 05:43 UTC · re: Brown, Len · lore

Re: using-topic-branches.txt

"Brown, Len" <len.brown@intel.com> writes:

> This works for me, but now it requires a password to update
> when before it did not.

You are right. I do not have preference either way myself what to put in this document. However, the change stops recommending rsync://, which is something I prefer to keep.

The reason for the change from public machine to master already got an objection from Jeff. The reasoning was because I understand that Linus pulls from master to avoid mirroring lags (and he publicly stated he does so number of times), and the workflow recommended for subsystem maintainers, the primary audience of this document, should not slow them down by pulling from public machines.

Linus Torvalds· Dec 19, 2005, 06:27 UTC · re: Junio C Hamano · lore

Re: using-topic-branches.txt

On Sun, 18 Dec 2005, Junio C Hamano wrote:

Show 8 quoted lines

> "Brown, Len" <len.brown@intel.com> writes:
> 
> > This works for me, but now it requires a password to update
> > when before it did not.
> 
> You are right.  I do not have preference either way myself what
> to put in this document.  However, the change stops recommending
> rsync://, which is something I prefer to keep.

Well, you can use "git://git.kernel.org/" for reading.

Personally, I use master.kernel.org both for reading and writing, but I end up using an ssh key with an empty passphrase.

		Linus

H. Peter Anvin· Dec 19, 2005, 22:25 UTC · re: Linus Torvalds · lore

Re: using-topic-branches.txt

Linus Torvalds wrote:

Show 6 quoted lines

> 
> Well, you can use "git://git.kernel.org/" for reading.
> 
> Personally, I use master.kernel.org both for reading and writing, but I 
> end up using an ssh key with an empty passphrase.
>

If you use ssh-agent then you don't have to use an empty passphrase. ssh-agent should be automatically set up in all the current distros.

	-hpa