Re: [PATCH 1/2] Documentation: Update 'linux-2.6.git' -> 'linux.git'

7 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH 1/2] Documentation: Update 'linux-2.6.git' -> 'linux.git'

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:57:50

"W. Trevor King" [off-list ref] writes:

I think any doc rewrites should be outside the scope of this patch,
which should just replace references to linux-2.6.git with linux.git
(as it does).

OK.

Should the size updates from 2/2 (user-manual: Update download size
for Git and the kernel) go into the reroll, or have they been picked
up in a separate branch?

I think 2/2 is fine.  Here is what I'll queue.

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index e831cc2..1cbf5af 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt

@@ -57,10 +57,10 @@ download a copy of an existing repository.  If you don't already have a
 project in mind, here are some interesting examples:
 
 ------------------------------------------------
-	# Git itself (approx. 10MB download):
+	# Git itself (approx. 40MB download):
 $ git clone git://git.kernel.org/pub/scm/git/git.git
-	# the Linux kernel (approx. 150MB download):
-$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+	# the Linux kernel (approx. 640MB download):
+$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 ------------------------------------------------
 
 The initial clone may be time-consuming for a large project, but you

[PATCH v2 2/4] doc/clone: Pick more compelling paths for the --reference example

From: W. Trevor King <hidden>
Date: 2016-06-15 22:57:52

From: "W. Trevor King" <redacted>

There may be times when using one of your local repositories as a
reference for a new clone make sense, but the implied version-bump in
the old example isn't one of them.  I think a more intuitive example
is multi-user system with a central reference clone, and the new paths
hint at this use case.

Signed-off-by: W. Trevor King <redacted>
---
 Documentation/git-clone.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index cec6fc1..bf05ada 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt

@@ -257,10 +257,10 @@ $ git show-branch
 * Clone from upstream while borrowing from an existing local directory:
 +
 ------------
-$ git clone --reference my2.6 \
-	git://git.kernel.org/pub/scm/.../linux-2.7 \
-	my2.7
-$ cd my2.7
+$ git clone --reference /git/linux.git \
+	git://git.kernel.org/pub/scm/.../linux.git \
+	my-linux
+$ cd my-linux
 ------------

-- 
1.8.3

[PATCH v2 4/4] Documentation: Update 'linux-2.6.git' -> 'linux.git'

From: W. Trevor King <hidden>
Date: 2016-06-15 22:57:53

From: "W. Trevor King" <redacted>

The 3.x tree has been out for a while now.  The -2.6 repository name
survived the initial release [1], but kernel.org now only lists
'linux.git' (for aegl as well as torvalds) [2].

[1]: http://article.gmane.org/gmane.linux.kernel/1147422
  On 2011-05-30 01:47:57 GMT, Linus Torvalds wrote:
  > ... yes, that means that my git tree is still called
  > "linux-2.6.git" on kernel.org.
[2]: http://git.kernel.org/cgit/

Signed-off-by: W. Trevor King <redacted>
---
 Documentation/git-clone.txt          | 4 ++--
 Documentation/git-fast-export.txt    | 2 +-
 Documentation/technical/racy-git.txt | 6 +++---
 Documentation/user-manual.txt        | 8 ++++----
 t/perf/README                        | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index bf05ada..98b139c 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt

@@ -239,8 +239,8 @@ Examples
 * Clone from upstream:
 +
 ------------
-$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6
-$ cd my2.6
+$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux
+$ cd my-linux
 $ make
 ------------

diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index d6487e1..0314da3 100644
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt

@@ -137,7 +137,7 @@ Limitations
 -----------
 
 Since 'git fast-import' cannot tag trees, you will not be
-able to export the linux-2.6.git repository completely, as it contains
+able to export the linux.git repository completely, as it contains
 a tag referencing a tree instead of a commit.
 
 GIT

diff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt
index 6dc82ca..f716d6d 100644
--- a/Documentation/technical/racy-git.txt
+++ b/Documentation/technical/racy-git.txt

@@ -135,9 +135,9 @@ them, and give the same timestamp to the index file:
   $ git ls-files | git update-index --stdin
   $ touch -r .datestamp .git/index
 
-This will make all index entries racily clean.  The linux-2.6
-project, for example, there are over 20,000 files in the working
-tree.  On my Athlon 64 X2 3800+, after the above:
+This will make all index entries racily clean.  The linux project, for
+example, there are over 20,000 files in the working tree.  On my
+Athlon 64 X2 3800+, after the above:
 
   $ /usr/bin/time git diff-files
   1.68user 0.54system 0:02.22elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 4283d8f..a13de93 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt

@@ -66,8 +66,8 @@ $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 The initial clone may be time-consuming for a large project, but you
 will only need to clone once.
 
-The clone command creates a new directory named after the project (`git`
-or `linux-2.6` in the examples above).  After you cd into this
+The clone command creates a new directory named after the project
+(`git` or `linux` in the examples above).  After you cd into this
 directory, you will see that it contains a copy of the project files,
 called the <<def_working_tree,working tree>>, together with a special
 top-level directory named `.git`, which contains all the information

@@ -2162,7 +2162,7 @@ To set this up, first create your work tree by cloning Linus's public
 tree:
 
 -------------------------------------------------
-$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git work
+$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git work
 $ cd work
 -------------------------------------------------

@@ -2204,7 +2204,7 @@ make it easy to push both branches to your public tree.  (See
 -------------------------------------------------
 $ cat >> .git/config <<EOF
 [remote "mytree"]
-	url =  master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
+	url =  master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux.git
 	push = release
 	push = test
 EOF

diff --git a/t/perf/README b/t/perf/README
index c552f56..8848c14 100644
--- a/t/perf/README
+++ b/t/perf/README

@@ -66,7 +66,7 @@ You can set the following variables (also in your config.mak):
     GIT_PERF_LARGE_REPO
 	Repositories to copy for the performance tests.  The normal
 	repo should be at least git.git size.  The large repo should
-	probably be about linux-2.6.git size for optimal results.
+	probably be about linux.git size for optimal results.
 	Both default to the git.git you are running from.
 
 You can also pass the options taken by ordinary git tests; the most

-- 
1.8.3

[PATCH v2 3/4] Documentation: Update the NFS remote examples to use the staging repo

From: W. Trevor King <hidden>
Date: 2016-06-15 22:57:53

From: "W. Trevor King" <redacted>

linux-nfs.org seems to have restructured their repository layout since
8391c60 (git-remote.txt: fix example url, 2007-11-02), and Bruce's
repo is now at git://git.linux-nfs.org/projects/bfields/linux.git.
Bruce also has a more richer internal branch structure (master,
everything, for-3.1, ...), so updating the existing example to use his
current repo may be confusing.

To simplify, I've replaced the NFS repo with Greg's staging repo.
I've also updated the output of the surrounding commands to match the
output of a current run through.

Signed-off-by: W. Trevor King <redacted>
---
 Documentation/git-remote.txt  | 25 ++++++++++++++++---------
 Documentation/user-manual.txt | 26 ++++++++++++++++----------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 7a6f354..d007163 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt

@@ -187,18 +187,25 @@ Examples
 $ git remote
 origin
 $ git branch -r
-origin/master
-$ git remote add linux-nfs git://linux-nfs.org/pub/linux/nfs-2.6.git
+  origin/HEAD -> origin/master
+  origin/master
+$ git remote add staging git://git.kernel.org/.../gregkh/staging.git
 $ git remote
-linux-nfs
 origin
-$ git fetch
-* refs/remotes/linux-nfs/master: storing branch 'master' ...
-  commit: bf81b46
+staging
+$ git fetch staging
+...
+From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
+ * [new branch]      master     -> staging/master
+ * [new branch]      staging-linus -> staging/staging-linus
+ * [new branch]      staging-next -> staging/staging-next
 $ git branch -r
-origin/master
-linux-nfs/master
-$ git checkout -b nfs linux-nfs/master
+  origin/HEAD -> origin/master
+  origin/master
+  staging/master
+  staging/staging-linus
+  staging/staging-next
+$ git checkout -b staging staging/master
 ...
 ------------

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index e831cc2..4283d8f 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt

@@ -431,19 +431,25 @@ You can also track branches from repositories other than the one you
 cloned from, using linkgit:git-remote[1]:
 
 -------------------------------------------------
-$ git remote add linux-nfs git://linux-nfs.org/pub/nfs-2.6.git
-$ git fetch linux-nfs
-* refs/remotes/linux-nfs/master: storing branch 'master' ...
-  commit: bf81b46
+$ git remote add staging git://git.kernel.org/.../gregkh/staging.git
+$ git fetch staging
+...
+From git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
+ * [new branch]      master     -> staging/master
+ * [new branch]      staging-linus -> staging/staging-linus
+ * [new branch]      staging-next -> staging/staging-next
 -------------------------------------------------
 
 New remote-tracking branches will be stored under the shorthand name
-that you gave `git remote add`, in this case `linux-nfs`:
+that you gave `git remote add`, in this case `staging`:
 
 -------------------------------------------------
 $ git branch -r
-linux-nfs/master
-origin/master
+  origin/HEAD -> origin/master
+  origin/master
+  staging/master
+  staging/staging-linus
+  staging/staging-next
 -------------------------------------------------
 
 If you run `git fetch <remote>` later, the remote-tracking branches

@@ -455,9 +461,9 @@ a new stanza:
 -------------------------------------------------
 $ cat .git/config
 ...
-[remote "linux-nfs"]
-	url = git://linux-nfs.org/pub/nfs-2.6.git
-	fetch = +refs/heads/*:refs/remotes/linux-nfs/*
+[remote "staging"]
+	url = git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
+	fetch = +refs/heads/*:refs/remotes/staging/*
 ...
 -------------------------------------------------

-- 
1.8.3

[PATCH v2 0/4] Update linux-2.6.git location and related examples

From: W. Trevor King <hidden>
Date: 2016-06-15 22:57:53

From: "W. Trevor King" <redacted>

David and Junio mentioned that I'd missed a few 2.6 references in my
initial pass.  Here's a second attempt that does some deeper reworking
of the effected sections.  Each deeper rewrite gets its own patch and
motivation, with the final patch making all the superficial changes
that were not fixed in the earlier patches.

I've dropped the download size update (2/2 in v1), which Junio has
queued separately.  I also rebased the series on maint-1.8.2, since
that's where the size update landed.  I only touch low-churn areas
though, so this series should apply to any recent branch.

W. Trevor King (4):
  doc/clone: Remove the '--bare -l -s' example
  doc/clone: Pick more compelling paths for the --reference example
  Documentation: Update the NFS remote examples to use the staging repo
  Documentation: Update 'linux-2.6.git' -> 'linux.git'

 Documentation/git-clone.txt          | 19 ++++++-------------
 Documentation/git-fast-export.txt    |  2 +-
 Documentation/git-remote.txt         | 25 ++++++++++++++++---------
 Documentation/technical/racy-git.txt |  6 +++---
 Documentation/user-manual.txt        | 34 ++++++++++++++++++++--------------
 t/perf/README                        |  2 +-
 6 files changed, 47 insertions(+), 41 deletions(-)

-- 
1.8.3

[PATCH v2 1/4] doc/clone: Remove the '--bare -l -s' example

From: W. Trevor King <hidden>
Date: 2016-06-15 22:57:53

From: "W. Trevor King" <redacted>

There are other examples in git-clone.txt demonstrating both '--bare'
and '-l -s'.

Signed-off-by: W. Trevor King <redacted>
---
 Documentation/git-clone.txt | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 5c16e31..cec6fc1 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt

@@ -271,13 +271,6 @@ $ git clone --bare -l /home/proj/.git /pub/scm/proj.git
 ------------
 
 
-* Create a repository on the kernel.org machine that borrows from Linus:
-+
-------------
-$ git clone --bare -l -s /pub/scm/.../torvalds/linux-2.6.git \
-    /pub/scm/.../me/subsys-2.6.git
-------------
-
 GIT
 ---
 Part of the linkgit:git[1] suite

-- 
1.8.3

Re: [PATCH v2 0/4] Update linux-2.6.git location and related examples

From: W. Trevor King <hidden>
Date: 2016-06-15 22:57:57

On Sat, Jun 22, 2013 at 10:46:23AM -0400, W. Trevor King wrote:

David and Junio mentioned that I'd missed a few 2.6 references in my
initial pass.  Here's a second attempt that does some deeper
reworking of the effected sections.

No comments after a week, so I'm giving this patch series a bump ;).

Thanks,
Trevor

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help