{"thread":{"id":"21790","subject":"[PATCH] Update $GIT_DIR/remotes to $GIT_DIR/refs/remotes in docs","startedAt":"2009-11-30T03:38:35Z","lastAt":"2009-11-30T07:48:42Z","messageCount":4,"participants":["ayiehere@gmail.com","Jeff King","Nazri Ramliy"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"128713","messageId":"1259552316-20088-1-git-send-email-ayiehere@gmail.com","threadId":"21790","inReplyTo":null,"subject":"[PATCH] Update $GIT_DIR/remotes to $GIT_DIR/refs/remotes in docs","fromName":"","fromEmail":"ayiehere@gmail.com","sentAt":"2009-11-30T03:38:35Z","receivedAt":"2009-11-30T03:38:35Z","isPatch":true,"sender":{"key":"ayiehere@gmail.com","avatar":"https://avatars.githubusercontent.com/u/164756?v=4"},"body":"I think this patch is is order now that $GIT_DIR/remotes is no longer used.\n"},{"id":"128714","messageId":"1259552316-20088-2-git-send-email-ayiehere@gmail.com","threadId":"21790","inReplyTo":"1259552316-20088-1-git-send-email-ayiehere@gmail.com","subject":"[PATCH] Update $GIT_DIR/remotes to $GIT_DIR/refs/remotes in docs","fromName":"","fromEmail":"ayiehere@gmail.com","sentAt":"2009-11-30T03:38:36Z","receivedAt":"2009-11-30T03:38:36Z","isPatch":true,"sender":{"key":"ayiehere@gmail.com","avatar":"https://avatars.githubusercontent.com/u/164756?v=4"},"body":"From: Nazri Ramliy \n\n---\n Documentation/git-parse-remote.txt | 2 +-\n Documentation/git-pull.txt | 6 +++---\n Documentation/git-remote.txt | 14 +++++++-------\n Documentation/git-show-branch.txt | 2 +-\n Documentation/urls-remotes.txt | 8 ++++----\n 5 files changed, 16 insertions(+), 16 deletions(-)\n\ndiff --git a/Documentation/git-parse-remote.txt b/Documentation/git-parse-remote.txt\nindex 39d9daa..9d27489 100644\n--- a/Documentation/git-parse-remote.txt\n+++ b/Documentation/git-parse-remote.txt\n@@ -13,7 +13,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n This script is included in various scripts to supply\n-routines to parse files under $GIT_DIR/remotes/ and\n+routines to parse files under $GIT_DIR/refs/remotes/ and\n $GIT_DIR/branches/ and configuration variables that are related\n to fetching, pulling and pushing.\n \ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex b932011..250d64c 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -74,13 +74,13 @@ present while on branch ``, that value is used instead of\n In order to determine what URL to use to fetch from, the value\n of the configuration `remote..url` is consulted\n and if there is not any such variable, the value on `URL: ` line\n-in `$GIT_DIR/remotes/` file is used.\n+in `$GIT_DIR/refs/remotes/` file is used.\n \n In order to determine what remote branches to fetch (and\n optionally store in the tracking branches) when the command is\n run without any refspec parameters on the command line, values\n of the configuration variable `remote..fetch` are\n-consulted, and if there aren't any, `$GIT_DIR/remotes/`\n+consulted, and if there aren't any, `$GIT_DIR/refs/remotes/`\n file is consulted and its `Pull: ` lines are used.\n In addition to the refspec formats described in the OPTIONS\n section, you can have a globbing refspec that looks like this:\n@@ -104,7 +104,7 @@ line of `git pull`, they are all merged.\n \n When no refspec was given on the command line, then `git pull`\n uses the refspec from the configuration or\n-`$GIT_DIR/remotes/`. In such cases, the following\n+`$GIT_DIR/refs/remotes/`. In such cases, the following\n rules apply:\n \n . If `branch..merge` configuration for the current\ndiff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt\nindex c272c92..9dbcb0b 100644\n--- a/Documentation/git-remote.txt\n+++ b/Documentation/git-remote.txt\n@@ -50,11 +50,11 @@ the remote information is set up.\n +\n With `-t ` option, instead of the default glob\n refspec for the remote to track all branches under\n-`$GIT_DIR/remotes//`, a refspec to track only ``\n+`$GIT_DIR/refs/remotes//`, a refspec to track only ``\n is created. You can give more than one `-t ` to track\n multiple branches without grabbing all branches.\n +\n-With `-m ` option, `$GIT_DIR/remotes//HEAD` is set\n+With `-m ` option, `$GIT_DIR/refs/remotes//HEAD` is set\n up to point at remote's `` branch. See also the set-head command.\n +\n In mirror mode, enabled with `\\--mirror`, the refs will not be stored\n@@ -69,7 +69,7 @@ Rename the remote named to . All remote tracking branches and\n configuration settings for the remote are updated.\n +\n In case and are the same, and is a file under\n-`$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to\n+`$GIT_DIR/refs/remotes` or `$GIT_DIR/branches`, the remote is converted to\n the configuration file format.\n \n 'rm'::\n@@ -79,23 +79,23 @@ configuration settings for the remote are removed.\n \n 'set-head'::\n \n-Sets or deletes the default branch (`$GIT_DIR/remotes//HEAD`) for\n+Sets or deletes the default branch (`$GIT_DIR/refs/remotes//HEAD`) for\n the named remote. Having a default branch for a remote is not required,\n but allows the name of the remote to be specified in lieu of a specific\n branch. For example, if the default branch for `origin` is set to\n `master`, then `origin` may be specified wherever you would normally\n specify `origin/master`.\n +\n-With `-d`, `$GIT_DIR/remotes//HEAD` is deleted.\n+With `-d`, `$GIT_DIR/refs/remotes//HEAD` is deleted.\n +\n With `-a`, the remote is queried to determine its `HEAD`, then\n-`$GIT_DIR/remotes//HEAD` is set to the same branch. e.g., if the remote\n+`$GIT_DIR/refs/remotes//HEAD` is set to the same branch. e.g., if the remote\n `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set\n `$GIT_DIR/refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will\n only work if `refs/remotes/origin/next` already exists; if not it must be\n fetched first.\n +\n-Use `` to set `$GIT_DIR/remotes//HEAD` explicitly. e.g., \"git\n+Use `` to set `$GIT_DIR/refs/remotes//HEAD` explicitly. e.g., \"git\n remote set-head origin master\" will set `$GIT_DIR/refs/remotes/origin/HEAD` to\n `refs/remotes/origin/master`. This will only work if\n `refs/remotes/origin/master` already exists; if not it must be fetched first.\ndiff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt\nindex 7343361..3671c2e 100644\n--- a/Documentation/git-show-branch.txt\n+++ b/Documentation/git-show-branch.txt\n@@ -161,7 +161,7 @@ $ git show-branch master fixes mhf\n + [mhf~5] Infamous 'octopus merge'\n + [mhf~6] Retire git-parse-remote.\n + [mhf~7] Multi-head fetch.\n- + [mhf~8] Start adding the $GIT_DIR/remotes/ support.\n+ + [mhf~8] Start adding the $GIT_DIR/refs/remotes/ support.\n *++ [master] Add 'git show-branch'.\n ------------------------------------------------\n \ndiff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt\nindex 2a0e7b8..5c4deeb 100644\n--- a/Documentation/urls-remotes.txt\n+++ b/Documentation/urls-remotes.txt\n@@ -7,7 +7,7 @@ The name of one of the following can be used instead\n of a URL as `` argument:\n \n * a remote in the git configuration file: `$GIT_DIR/config`,\n-* a file in the `$GIT_DIR/remotes` directory, or\n+* a file in the `$GIT_DIR/refs/remotes` directory, or\n * a file in the `$GIT_DIR/branches` directory.\n \n All of these also allow you to omit the refspec from the command line\n@@ -35,11 +35,11 @@ config file would appear like this:\n The `` is used for pushes only. It is optional and defaults\n to ``.\n \n-Named file in `$GIT_DIR/remotes`\n-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+Named file in `$GIT_DIR/refs/remotes`\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n You can choose to provide the name of a\n-file in `$GIT_DIR/remotes`. The URL\n+file in `$GIT_DIR/refs/remotes`. The URL\n in this file will be used to access the repository. The refspec\n in this file will be used as default when you do not\n provide a refspec on the command line. This file should have the\n-- \n1.6.6.rc0.63.g66abc\n"},{"id":"128715","messageId":"20091130050333.GA26585@coredump.intra.peff.net","threadId":"21790","inReplyTo":"1259552316-20088-2-git-send-email-ayiehere@gmail.com","subject":"Re: [PATCH] Update $GIT_DIR/remotes to $GIT_DIR/refs/remotes in docs","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-11-30T05:03:33Z","receivedAt":"2009-11-30T05:03:33Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Nov 30, 2009 at 11:38:36AM +0800, ayiehere@gmail.com wrote:\n\n> DESCRIPTION\n> -----------\n> This script is included in various scripts to supply\n> -routines to parse files under $GIT_DIR/remotes/ and\n> +routines to parse files under $GIT_DIR/refs/remotes/ and\n> $GIT_DIR/branches/ and configuration variables that are related\n> to fetching, pulling and pushing.\n\nEr, what? $GIT_DIR/remotes/ and $GIT_DIR/refs/remotes/ are not even\nremotely the same thing. The former holds information about how to\ncontact remotes (but that information is usually held in the config file\nthese days). The latter holds any tracking refs we have fetched from\nthe remotes.\n\n-Peff\n"},{"id":"128739","messageId":"544dda350911292348g7790b64ep4782dffc427bbde5@mail.gmail.com","threadId":"21790","inReplyTo":"20091130050333.GA26585@coredump.intra.peff.net","subject":"Re: [PATCH] Update $GIT_DIR/remotes to $GIT_DIR/refs/remotes in docs","fromName":"Nazri Ramliy","fromEmail":"ayiehere@gmail.com","sentAt":"2009-11-30T07:48:42Z","receivedAt":"2009-11-30T07:48:42Z","isPatch":true,"sender":{"key":"ayiehere@gmail.com","avatar":"https://avatars.githubusercontent.com/u/164756?v=4"},"body":"On Mon, Nov 30, 2009 at 1:03 PM, Jeff King wrote:\n> Er, what? $GIT_DIR/remotes/ and $GIT_DIR/refs/remotes/ are not even\n> remotely the same thing. The former holds information about how to\n> contact remotes (but that information is usually held in the config file\n> these days).  The latter holds any tracking refs we have fetched from\n> the remotes.\n\nErg.. thanks for the enlightenment.\n\nI was reading 'git help remote' while attempting to change my local git\nrepo from tracking\n\n http://www.kernel.org/pub/scm/git/git.git\n\nto\n\n git://git.kernel.org/pub/scm/git/git.git\n\nand noticed that the documentation refers to $GIT_DIR/remotes and\n(wrongly) thought that it meant $GIT_DIR/refs/remotes.\n\nSorry for the noise.\n\nNazri.\n"}]}