{"thread":{"id":"34213","subject":"[PATCH 2/2] user-manual: Update download size for Git and the kernel","startedAt":"2013-06-19T01:55:20Z","lastAt":"2013-06-30T10:48:23Z","messageCount":18,"participants":["W. Trevor King","David Aguilar","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"221321","messageId":"cover.1371606791.git.wking@tremily.us","threadId":"34213","inReplyTo":null,"subject":"[PATCH 0/2] Update linux-2.6.git location and repo size","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2013-06-19T01:55:20Z","receivedAt":"2013-06-19T01:55:20Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"From: \"W. Trevor King\" \n\nBring the docs back up to date with the real world ;). Patches are\nagainst the current gitster/maint. The commit messages may be to\nchatty, so let me know if you'd like a trimmed down version.\n\nW. Trevor King (2):\n Documentation: Update 'linux-2.6.git' -> 'linux.git'\n user-manual: Update download size for Git and the kernel\n\n Documentation/git-clone.txt | 2 +-\n Documentation/git-fast-export.txt | 2 +-\n Documentation/user-manual.txt | 10 +++++-----\n t/perf/README | 2 +-\n 4 files changed, 8 insertions(+), 8 deletions(-)\n\n-- \n1.8.3\n"},{"id":"221320","messageId":"3286ddfe2dd6cbf9c435bd7f9eb579782eb32e1f.1371606791.git.wking@tremily.us","threadId":"34213","inReplyTo":"cover.1371606791.git.wking@tremily.us","subject":"[PATCH 1/2] Documentation: Update 'linux-2.6.git' -> 'linux.git'","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2013-06-19T01:55:21Z","receivedAt":"2013-06-19T01:55:21Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"From: \"W. Trevor King\" \n\nThe 3.x tree has been out for a while now. The -2.6 repository name\nsurvived the initial release [1], but kernel.org now only lists\n'linux.git' (for aegl as well as torvalds) [2].\n\n[1]: http://article.gmane.org/gmane.linux.kernel/1147422\n On 2011-05-30 01:47:57 GMT, Linus Torvalds wrote:\n > ... yes, that means that my git tree is still called\n > \"linux-2.6.git\" on kernel.org.\n[2]: http://git.kernel.org/cgit/\n\nSigned-off-by: W. Trevor King \n---\n Documentation/git-clone.txt | 2 +-\n Documentation/git-fast-export.txt | 2 +-\n Documentation/user-manual.txt | 6 +++---\n t/perf/README | 2 +-\n 4 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex a0727d7..8e5260f 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -274,7 +274,7 @@ $ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n * Create a repository on the kernel.org machine that borrows from Linus:\n +\n ------------\n-$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \\\n+$ git clone --bare -l -s /pub/scm/.../torvalds/linux.git \\\n /pub/scm/.../me/subsys-2.6.git\n ------------\n \ndiff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt\nindex efb0380..85f1f30 100644\n--- a/Documentation/git-fast-export.txt\n+++ b/Documentation/git-fast-export.txt\n@@ -141,7 +141,7 @@ Limitations\n -----------\n \n Since 'git fast-import' cannot tag trees, you will not be\n-able to export the linux-2.6.git repository completely, as it contains\n+able to export the linux.git repository completely, as it contains\n a tag referencing a tree instead of a commit.\n \n GIT\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex e831cc2..cd9941a 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -60,7 +60,7 @@ project in mind, here are some interesting examples:\n \t# Git itself (approx. 10MB download):\n $ git clone git://git.kernel.org/pub/scm/git/git.git\n \t# the Linux kernel (approx. 150MB download):\n-$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n+$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\n ------------------------------------------------\n \n The initial clone may be time-consuming for a large project, but you\n@@ -2156,7 +2156,7 @@ To set this up, first create your work tree by cloning Linus's public\n tree:\n \n -------------------------------------------------\n-$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work\n+$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git work\n $ cd work\n -------------------------------------------------\n \n@@ -2198,7 +2198,7 @@ make it easy to push both branches to your public tree. (See\n -------------------------------------------------\n $ cat >> .git/config <\n\nThey've grown since d19fbc3 (Documentation: add git user's manual,\n2007-01-07) when the stats were initially added. I've rounded\ndownload sizes up to the nearest power of ten MiB to decrease the\nprecision and give a bit of growing room. Exact sizes:\n\n $ git clone git://git.kernel.org/pub/scm/git/git.git\n Initialized empty Git repository in /tmp/git/.git/\n remote: Counting objects: 156872, done.\n remote: Compressing objects: 100% (40826/40826), done.\n remote: Total 156872 (delta 115322), reused 155492 (delta 114094)\n Receiving objects: 100% (156872/156872), 37.29 MiB | 7.54 MiB/s, done.\n Resolving deltas: 100% (115322/115322), done.\n\n $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\n Initialized empty Git repository in /tmp/linux/.git/\n remote: Counting objects: 3057404, done.\n remote: Compressing objects: 100% (474769/474769), done.\n Receiving objects: 100% (3057404/3057404), 634.33 MiB | 27.95 MiB/s, done.\n remote: Total 3057404 (delta 2570385), reused 3040910 (delta 2554408)\n Resolving deltas: 100% (2570385/2570385), done.\n Checking out files: 100% (43012/43012), done.\n\nSigned-off-by: W. Trevor King \n---\n Documentation/user-manual.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex cd9941a..ffc4e1c 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -57,9 +57,9 @@ download a copy of an existing repository. If you don't already have a\n project in mind, here are some interesting examples:\n \n ------------------------------------------------\n-\t# Git itself (approx. 10MB download):\n+\t# Git itself (approx. 40MB download):\n $ git clone git://git.kernel.org/pub/scm/git/git.git\n-\t# the Linux kernel (approx. 150MB download):\n+\t# the Linux kernel (approx. 640MB download):\n $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\n ------------------------------------------------\n \n-- \n1.8.3\n"},{"id":"221326","messageId":"CAJDDKr75PwVjJ-hs=1eBQEKG0O7FaZROfHRT-oujANeFN-ErMw@mail.gmail.com","threadId":"34213","inReplyTo":"3286ddfe2dd6cbf9c435bd7f9eb579782eb32e1f.1371606791.git.wking@tremily.us","subject":"Re: [PATCH 1/2] Documentation: Update 'linux-2.6.git' -> 'linux.git'","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2013-06-19T05:05:50Z","receivedAt":"2013-06-19T05:05:50Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Tue, Jun 18, 2013 at 6:55 PM, W. Trevor King wrote:\n> From: \"W. Trevor King\" \n>\n> The 3.x tree has been out for a while now. The -2.6 repository name\n> survived the initial release [1], but kernel.org now only lists\n> 'linux.git' (for aegl as well as torvalds) [2].\n>\n> [1]: http://article.gmane.org/gmane.linux.kernel/1147422\n> On 2011-05-30 01:47:57 GMT, Linus Torvalds wrote:\n> > ... yes, that means that my git tree is still called\n> > \"linux-2.6.git\" on kernel.org.\n> [2]: http://git.kernel.org/cgit/\n>\n> Signed-off-by: W. Trevor King \n> ---\n> Documentation/git-clone.txt | 2 +-\n> Documentation/git-fast-export.txt | 2 +-\n> Documentation/user-manual.txt | 6 +++---\n> t/perf/README | 2 +-\n> 4 files changed, 6 insertions(+), 6 deletions(-)\n>\n> diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\n> index a0727d7..8e5260f 100644\n> --- a/Documentation/git-clone.txt\n> +++ b/Documentation/git-clone.txt\n> @@ -274,7 +274,7 @@ $ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n> * Create a repository on the kernel.org machine that borrows from Linus:\n> +\n> ------------\n> -$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \\\n> +$ git clone --bare -l -s /pub/scm/.../torvalds/linux.git \\\n> /pub/scm/.../me/subsys-2.6.git\n\nPerhaps subsys.git instead of subsys-2.6.git too?\n--\nDavid\n"},{"id":"221378","messageId":"20130619114823.GK15550@odin.tremily.us","threadId":"34213","inReplyTo":"CAJDDKr75PwVjJ-hs=1eBQEKG0O7FaZROfHRT-oujANeFN-ErMw@mail.gmail.com","subject":"Re: [PATCH 1/2] Documentation: Update 'linux-2.6.git' -> 'linux.git'","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2013-06-19T11:48:23Z","receivedAt":"2013-06-19T11:48:23Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"On Tue, Jun 18, 2013 at 10:05:50PM -0700, David Aguilar wrote:\n> On Tue, Jun 18, 2013 at 6:55 PM, W. Trevor King wrote:\n> > -$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \\\n> > +$ git clone --bare -l -s /pub/scm/.../torvalds/linux.git \\\n> > /pub/scm/.../me/subsys-2.6.git\n> \n> Perhaps subsys.git instead of subsys-2.6.git too?\n\nGood point. `git grep -- -2.6.git` also turns up a few references to\ngit://linux-nfs.org/pub/nfs-2.6.git, but I can't figure out where that\nhas gone. It looks like the NFS folks only have personal repositories\nanymore [1].\n\nCheers,\nTrevor\n\n[1]: http://git.linux-nfs.org/\n\n-- \nThis email may be signed or encrypted with GnuPG (http://www.gnupg.org).\nFor more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\n"},{"id":"221385","messageId":"7vtxku112r.fsf@alter.siamese.dyndns.org","threadId":"34213","inReplyTo":"3286ddfe2dd6cbf9c435bd7f9eb579782eb32e1f.1371606791.git.wking@tremily.us","subject":"Re: [PATCH 1/2] Documentation: Update 'linux-2.6.git' -> 'linux.git'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-19T17:07:24Z","receivedAt":"2013-06-19T17:07:24Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"W. Trevor King\" writes:\n\n> diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\n> index a0727d7..8e5260f 100644\n> --- a/Documentation/git-clone.txt\n> +++ b/Documentation/git-clone.txt\n> @@ -274,7 +274,7 @@ $ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n> * Create a repository on the kernel.org machine that borrows from Linus:\n> +\n> ------------\n> -$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \\\n> +$ git clone --bare -l -s /pub/scm/.../torvalds/linux.git \\\n> /pub/scm/.../me/subsys-2.6.git\n> ------------\n\nAside from s|subsys-2.6|subsys| David already mentioned, I think\nit is a lot saner to remove this particular example. Nobody runs\nshell on k.org machines these days, and local borrowing \"-l -s\" is\nalready shown in another example.\n\nAlso you seem to have missed another \"linux-2.6 my2.6\" clone in the\nfirst example.\n\nWill not apply in this form; expecting a reroll.\n\nThanks.\n"},{"id":"221386","messageId":"7vppvi111t.fsf@alter.siamese.dyndns.org","threadId":"34213","inReplyTo":"deb78c114d068ab3f9e28bcd019c3e29ad7b770c.1371606791.git.wking@tremily.us","subject":"Re: [PATCH 2/2] user-manual: Update download size for Git and the kernel","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-19T17:07:58Z","receivedAt":"2013-06-19T17:07:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks, will queue.\n"},{"id":"221408","messageId":"20130619194709.GQ15550@odin.tremily.us","threadId":"34213","inReplyTo":"7vtxku112r.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 1/2] Documentation: Update 'linux-2.6.git' -> 'linux.git'","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2013-06-19T19:47:10Z","receivedAt":"2013-06-19T19:47:10Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"On Wed, Jun 19, 2013 at 10:07:24AM -0700, Junio C Hamano wrote:\n> \"W. Trevor King\" writes:\n> \n> > diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\n> > index a0727d7..8e5260f 100644\n> > --- a/Documentation/git-clone.txt\n> > +++ b/Documentation/git-clone.txt\n> > @@ -274,7 +274,7 @@ $ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n> > * Create a repository on the kernel.org machine that borrows from Linus:\n> > +\n> > ------------\n> > -$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \\\n> > +$ git clone --bare -l -s /pub/scm/.../torvalds/linux.git \\\n> > /pub/scm/.../me/subsys-2.6.git\n> > ------------\n> \n> Aside from s|subsys-2.6|subsys| David already mentioned, I think\n> it is a lot saner to remove this particular example. Nobody runs\n> shell on k.org machines these days, and local borrowing \"-l -s\" is\n> already shown in another example.\n> \n> Also you seem to have missed another \"linux-2.6 my2.6\" clone in the\n> first example.\n\nBetween the nfs-2.6 examples I mentioned earlier, the my2.6 clone\nhere, and the:\n\n $ git clone --reference my2.6 \\\n git://git.kernel.org/pub/scm/.../linux-2.7 \\\n my2.7\n\nexample listed later in git-clone.txt, I think we're trying to push\nlinux.git examples too far ;). However, I can't think of a simple\nexample for --reference that doesn't drag in a longer discussion to\nmotivate shared object repositories. I'll hunt through the rest of\nthe docs looking for other examples I can reuse.\n\nI think any doc rewrites should be outside the scope of this patch,\nwhich should just replace references to linux-2.6.git with linux.git\n(as it does). Further cleanups to remove references to the NFS and\nmy2.{6,7} stuff and replace them with alternative examples can come as\nfollow-up patches in v2 of this series. Does that sound reasonable?\n\nShould the size updates from 2/2 (user-manual: Update download size\nfor Git and the kernel) go into the reroll, or have they been picked\nup in a separate branch?\n\nCheers,\nTrevor\n\n-- \nThis email may be signed or encrypted with GnuPG (http://www.gnupg.org).\nFor more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\n"},{"id":"221410","messageId":"7vppvhye6s.fsf@alter.siamese.dyndns.org","threadId":"34213","inReplyTo":"20130619194709.GQ15550@odin.tremily.us","subject":"Re: [PATCH 1/2] Documentation: Update 'linux-2.6.git' -> 'linux.git'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-19T21:37:47Z","receivedAt":"2013-06-19T21:37:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"W. Trevor King\" writes:\n\n> I think any doc rewrites should be outside the scope of this patch,\n> which should just replace references to linux-2.6.git with linux.git\n> (as it does). \n\nOK.\n\n> Should the size updates from 2/2 (user-manual: Update download size\n> for Git and the kernel) go into the reroll, or have they been picked\n> up in a separate branch?\n\nI think 2/2 is fine. Here is what I'll queue.\n\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex e831cc2..1cbf5af 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -57,10 +57,10 @@ download a copy of an existing repository. If you don't already have a\n project in mind, here are some interesting examples:\n \n ------------------------------------------------\n-\t# Git itself (approx. 10MB download):\n+\t# Git itself (approx. 40MB download):\n $ git clone git://git.kernel.org/pub/scm/git/git.git\n-\t# the Linux kernel (approx. 150MB download):\n-$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n+\t# the Linux kernel (approx. 640MB download):\n+$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git\n ------------------------------------------------\n \n The initial clone may be time-consuming for a large project, but you\n"},{"id":"221685","messageId":"20130622124033.GG5615@odin.tremily.us","threadId":"34213","inReplyTo":"deb78c114d068ab3f9e28bcd019c3e29ad7b770c.1371606791.git.wking@tremily.us","subject":"Re: [PATCH 2/2] user-manual: Update download size for Git and the kernel","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2013-06-22T12:40:33Z","receivedAt":"2013-06-22T12:40:33Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"On Tue, Jun 18, 2013 at 09:55:22PM -0400, W. Trevor King wrote:\n> They've grown since d19fbc3 (Documentation: add git user's manual,\n> 2007-01-07) when the stats were initially added. I've rounded\n> download sizes up to the nearest power of ten MiB to decrease the\n> precision and give a bit of growing room. Exact sizes:\n\nOops, I meant “multiple of ten MiB” not “power of ten MiB” :p. Not\nthat this wording is likely to cause major confusion ;).\n\nCheers,\nTrevor\n\n-- \nThis email may be signed or encrypted with GnuPG (http://www.gnupg.org).\nFor more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\n"},{"id":"221693","messageId":"cover.1371911897.git.wking@tremily.us","threadId":"34213","inReplyTo":"7vppvhye6s.fsf@alter.siamese.dyndns.org","subject":"[PATCH v2 0/4] Update linux-2.6.git location and related examples","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2013-06-22T14:46:23Z","receivedAt":"2013-06-22T14:46:23Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"From: \"W. Trevor King\" \n\nDavid and Junio mentioned that I'd missed a few 2.6 references in my\ninitial pass. Here's a second attempt that does some deeper reworking\nof the effected sections. Each deeper rewrite gets its own patch and\nmotivation, with the final patch making all the superficial changes\nthat were not fixed in the earlier patches.\n\nI've dropped the download size update (2/2 in v1), which Junio has\nqueued separately. I also rebased the series on maint-1.8.2, since\nthat's where the size update landed. I only touch low-churn areas\nthough, so this series should apply to any recent branch.\n\nW. Trevor King (4):\n doc/clone: Remove the '--bare -l -s' example\n doc/clone: Pick more compelling paths for the --reference example\n Documentation: Update the NFS remote examples to use the staging repo\n Documentation: Update 'linux-2.6.git' -> 'linux.git'\n\n Documentation/git-clone.txt | 19 ++++++-------------\n Documentation/git-fast-export.txt | 2 +-\n Documentation/git-remote.txt | 25 ++++++++++++++++---------\n Documentation/technical/racy-git.txt | 6 +++---\n Documentation/user-manual.txt | 34 ++++++++++++++++++++--------------\n t/perf/README | 2 +-\n 6 files changed, 47 insertions(+), 41 deletions(-)\n\n-- \n1.8.3\n"},{"id":"221694","messageId":"fb9dc74892299d30e4b313353fddf663cc28b212.1371911897.git.wking@tremily.us","threadId":"34213","inReplyTo":"cover.1371911897.git.wking@tremily.us","subject":"[PATCH v2 1/4] doc/clone: Remove the '--bare -l -s' example","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2013-06-22T14:46:24Z","receivedAt":"2013-06-22T14:46:24Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"From: \"W. Trevor King\" \n\nThere are other examples in git-clone.txt demonstrating both '--bare'\nand '-l -s'.\n\nSigned-off-by: W. Trevor King \n---\n Documentation/git-clone.txt | 7 -------\n 1 file changed, 7 deletions(-)\n\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex 5c16e31..cec6fc1 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -271,13 +271,6 @@ $ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n ------------\n \n \n-* Create a repository on the kernel.org machine that borrows from Linus:\n-+\n-------------\n-$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \\\n- /pub/scm/.../me/subsys-2.6.git\n-------------\n-\n GIT\n ---\n Part of the linkgit:git[1] suite\n-- \n1.8.3\n"},{"id":"221690","messageId":"79c2444a4fc73cbf699f571351780ce59f5d8785.1371911897.git.wking@tremily.us","threadId":"34213","inReplyTo":"cover.1371911897.git.wking@tremily.us","subject":"[PATCH v2 2/4] doc/clone: Pick more compelling paths for the --reference example","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2013-06-22T14:46:25Z","receivedAt":"2013-06-22T14:46:25Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"From: \"W. Trevor King\" \n\nThere may be times when using one of your local repositories as a\nreference for a new clone make sense, but the implied version-bump in\nthe old example isn't one of them. I think a more intuitive example\nis multi-user system with a central reference clone, and the new paths\nhint at this use case.\n\nSigned-off-by: W. Trevor King \n---\n Documentation/git-clone.txt | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex cec6fc1..bf05ada 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -257,10 +257,10 @@ $ git show-branch\n * Clone from upstream while borrowing from an existing local directory:\n +\n ------------\n-$ git clone --reference my2.6 \\\n-\tgit://git.kernel.org/pub/scm/.../linux-2.7 \\\n-\tmy2.7\n-$ cd my2.7\n+$ git clone --reference /git/linux.git \\\n+\tgit://git.kernel.org/pub/scm/.../linux.git \\\n+\tmy-linux\n+$ cd my-linux\n ------------\n \n \n-- \n1.8.3\n"},{"id":"221692","messageId":"d668c4fac602e8f97a7abdb36a169b5a67bc3383.1371911897.git.wking@tremily.us","threadId":"34213","inReplyTo":"cover.1371911897.git.wking@tremily.us","subject":"[PATCH v2 3/4] Documentation: Update the NFS remote examples to use the staging repo","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2013-06-22T14:46:26Z","receivedAt":"2013-06-22T14:46:26Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"From: \"W. Trevor King\" \n\nlinux-nfs.org seems to have restructured their repository layout since\n8391c60 (git-remote.txt: fix example url, 2007-11-02), and Bruce's\nrepo is now at git://git.linux-nfs.org/projects/bfields/linux.git.\nBruce also has a more richer internal branch structure (master,\neverything, for-3.1, ...), so updating the existing example to use his\ncurrent repo may be confusing.\n\nTo simplify, I've replaced the NFS repo with Greg's staging repo.\nI've also updated the output of the surrounding commands to match the\noutput of a current run through.\n\nSigned-off-by: W. Trevor King \n---\n Documentation/git-remote.txt | 25 ++++++++++++++++---------\n Documentation/user-manual.txt | 26 ++++++++++++++++----------\n 2 files changed, 32 insertions(+), 19 deletions(-)\n\ndiff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt\nindex 7a6f354..d007163 100644\n--- a/Documentation/git-remote.txt\n+++ b/Documentation/git-remote.txt\n@@ -187,18 +187,25 @@ Examples\n $ git remote\n origin\n $ git branch -r\n-origin/master\n-$ git remote add linux-nfs git://linux-nfs.org/pub/linux/nfs-2.6.git\n+ origin/HEAD -> origin/master\n+ origin/master\n+$ git remote add staging git://git.kernel.org/.../gregkh/staging.git\n $ git remote\n-linux-nfs\n origin\n-$ git fetch\n-* refs/remotes/linux-nfs/master: storing branch 'master' ...\n- commit: bf81b46\n+staging\n+$ git fetch staging\n+...\n+From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n+ * [new branch] master -> staging/master\n+ * [new branch] staging-linus -> staging/staging-linus\n+ * [new branch] staging-next -> staging/staging-next\n $ git branch -r\n-origin/master\n-linux-nfs/master\n-$ git checkout -b nfs linux-nfs/master\n+ origin/HEAD -> origin/master\n+ origin/master\n+ staging/master\n+ staging/staging-linus\n+ staging/staging-next\n+$ git checkout -b staging staging/master\n ...\n ------------\n \ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex e831cc2..4283d8f 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -431,19 +431,25 @@ You can also track branches from repositories other than the one you\n cloned from, using linkgit:git-remote[1]:\n \n -------------------------------------------------\n-$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git\n-$ git fetch linux-nfs\n-* refs/remotes/linux-nfs/master: storing branch 'master' ...\n- commit: bf81b46\n+$ git remote add staging git://git.kernel.org/.../gregkh/staging.git\n+$ git fetch staging\n+...\n+From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n+ * [new branch] master -> staging/master\n+ * [new branch] staging-linus -> staging/staging-linus\n+ * [new branch] staging-next -> staging/staging-next\n -------------------------------------------------\n \n New remote-tracking branches will be stored under the shorthand name\n-that you gave `git remote add`, in this case `linux-nfs`:\n+that you gave `git remote add`, in this case `staging`:\n \n -------------------------------------------------\n $ git branch -r\n-linux-nfs/master\n-origin/master\n+ origin/HEAD -> origin/master\n+ origin/master\n+ staging/master\n+ staging/staging-linus\n+ staging/staging-next\n -------------------------------------------------\n \n If you run `git fetch ` later, the remote-tracking branches\n@@ -455,9 +461,9 @@ a new stanza:\n -------------------------------------------------\n $ cat .git/config\n ...\n-[remote \"linux-nfs\"]\n-\turl = git://linux-nfs.org/pub/nfs-2.6.git\n-\tfetch = +refs/heads/*:refs/remotes/linux-nfs/*\n+[remote \"staging\"]\n+\turl = git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git\n+\tfetch = +refs/heads/*:refs/remotes/staging/*\n ...\n -------------------------------------------------\n \n-- \n1.8.3\n"},{"id":"221691","messageId":"ce90543ed8c24f0968aafd9fb457bce409acd50c.1371911897.git.wking@tremily.us","threadId":"34213","inReplyTo":"cover.1371911897.git.wking@tremily.us","subject":"[PATCH v2 4/4] Documentation: Update 'linux-2.6.git' -> 'linux.git'","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2013-06-22T14:46:27Z","receivedAt":"2013-06-22T14:46:27Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"From: \"W. Trevor King\" \n\nThe 3.x tree has been out for a while now. The -2.6 repository name\nsurvived the initial release [1], but kernel.org now only lists\n'linux.git' (for aegl as well as torvalds) [2].\n\n[1]: http://article.gmane.org/gmane.linux.kernel/1147422\n On 2011-05-30 01:47:57 GMT, Linus Torvalds wrote:\n > ... yes, that means that my git tree is still called\n > \"linux-2.6.git\" on kernel.org.\n[2]: http://git.kernel.org/cgit/\n\nSigned-off-by: W. Trevor King \n---\n Documentation/git-clone.txt | 4 ++--\n Documentation/git-fast-export.txt | 2 +-\n Documentation/technical/racy-git.txt | 6 +++---\n Documentation/user-manual.txt | 8 ++++----\n t/perf/README | 2 +-\n 5 files changed, 11 insertions(+), 11 deletions(-)\n\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex bf05ada..98b139c 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -239,8 +239,8 @@ Examples\n * Clone from upstream:\n +\n ------------\n-$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n-$ cd my2.6\n+$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n+$ cd my-linux\n $ make\n ------------\n \ndiff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt\nindex d6487e1..0314da3 100644\n--- a/Documentation/git-fast-export.txt\n+++ b/Documentation/git-fast-export.txt\n@@ -137,7 +137,7 @@ Limitations\n -----------\n \n Since 'git fast-import' cannot tag trees, you will not be\n-able to export the linux-2.6.git repository completely, as it contains\n+able to export the linux.git repository completely, as it contains\n a tag referencing a tree instead of a commit.\n \n GIT\ndiff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt\nindex 6dc82ca..f716d6d 100644\n--- a/Documentation/technical/racy-git.txt\n+++ b/Documentation/technical/racy-git.txt\n@@ -135,9 +135,9 @@ them, and give the same timestamp to the index file:\n $ git ls-files | git update-index --stdin\n $ touch -r .datestamp .git/index\n \n-This will make all index entries racily clean. The linux-2.6\n-project, for example, there are over 20,000 files in the working\n-tree. On my Athlon 64 X2 3800+, after the above:\n+This will make all index entries racily clean. The linux project, for\n+example, there are over 20,000 files in the working tree. On my\n+Athlon 64 X2 3800+, after the above:\n \n $ /usr/bin/time git diff-files\n 1.68user 0.54system 0:02.22elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex 4283d8f..a13de93 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -66,8 +66,8 @@ $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n The initial clone may be time-consuming for a large project, but you\n will only need to clone once.\n \n-The clone command creates a new directory named after the project (`git`\n-or `linux-2.6` in the examples above). After you cd into this\n+The clone command creates a new directory named after the project\n+(`git` or `linux` in the examples above). After you cd into this\n directory, you will see that it contains a copy of the project files,\n called the <>, together with a special\n top-level directory named `.git`, which contains all the information\n@@ -2162,7 +2162,7 @@ To set this up, first create your work tree by cloning Linus's public\n tree:\n \n -------------------------------------------------\n-$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work\n+$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git work\n $ cd work\n -------------------------------------------------\n \n@@ -2204,7 +2204,7 @@ make it easy to push both branches to your public tree. (See\n -------------------------------------------------\n $ cat >> .git/config < David and Junio mentioned that I'd missed a few 2.6 references in my\n> initial pass. Here's a second attempt that does some deeper\n> reworking of the effected sections.\n\nNo comments after a week, so I'm giving this patch series a bump ;).\n\nThanks,\nTrevor\n"},{"id":"222234","messageId":"7vfvw0l6d9.fsf@alter.siamese.dyndns.org","threadId":"34213","inReplyTo":"20130630010532.GB25463@odin.tremily.us","subject":"Re: [PATCH v2 0/4] Update linux-2.6.git location and related examples","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-30T01:44:34Z","receivedAt":"2013-06-30T01:44:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"W. Trevor King\" writes:\n\n> On Sat, Jun 22, 2013 at 10:46:23AM -0400, W. Trevor King wrote:\n>> David and Junio mentioned that I'd missed a few 2.6 references in my\n>> initial pass. Here's a second attempt that does some deeper\n>> reworking of the effected sections.\n>\n> No comments after a week, so I'm giving this patch series a bump ;).\n\nHmph, didn't I queue them on 'pu' already?\n"},{"id":"222239","messageId":"20130630104823.GD25463@odin.tremily.us","threadId":"34213","inReplyTo":"7vfvw0l6d9.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v2 0/4] Update linux-2.6.git location and related examples","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2013-06-30T10:48:23Z","receivedAt":"2013-06-30T10:48:23Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"On Sat, Jun 29, 2013 at 06:44:34PM -0700, Junio C Hamano wrote:\n> \"W. Trevor King\" writes:\n> \n> > On Sat, Jun 22, 2013 at 10:46:23AM -0400, W. Trevor King wrote:\n> >> David and Junio mentioned that I'd missed a few 2.6 references in my\n> >> initial pass. Here's a second attempt that does some deeper\n> >> reworking of the effected sections.\n> >\n> > No comments after a week, so I'm giving this patch series a bump ;).\n> \n> Hmph, didn't I queue them on 'pu' already?\n\nOops, that would be my first time having a patch series queued without\ncomment ;). Sorry for the noise.\n\nThanks,\nTrevor\n\n-- \nThis email may be signed or encrypted with GnuPG (http://www.gnupg.org).\nFor more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\n"}]}