Change "tracking branch" to "remote-tracking branch"

One more step towards consistancy. We change the documentation and the C
code in a single patch, since the only instances in the C code are in
comment and usage strings.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index e625d6a85b69c2c079fec99983fc8f1f654c494c..e4f16d8111f3c6c985ea781ce6b3fd877446c05b 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -680,7 +680,7 @@ color.branch::
 color.branch.<slot>::
        Use customized color for branch coloration. `<slot>` is one of
        `current` (the current branch), `local` (a local branch),
 color.branch.<slot>::
        Use customized color for branch coloration. `<slot>` is one of
        `current` (the current branch), `local` (a local branch),

-       `remote` (a tracking branch in refs/remotes/), `plain` (other
+       `remote` (a remote-tracking branch in refs/remotes/), `plain` (other

        refs).
 +
 The value for these configuration variables is a list of colors (at most
        refs).
 +
 The value for these configuration variables is a list of colors (at most


@@ -1102,7 +1102,7 @@ gui.newbranchtemplate::
        linkgit:git-gui[1].
 
 gui.pruneduringfetch::
        linkgit:git-gui[1].
 
 gui.pruneduringfetch::

-       "true" if linkgit:git-gui[1] should prune tracking branches when
+       "true" if linkgit:git-gui[1] should prune remote-tracking branches when

        performing a fetch. The default value is "false".
 
 gui.trustmtime::
        performing a fetch. The default value is "false".
 
 gui.trustmtime::

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index d159e88292cbab575be8153b381fffd1f4c85b6b..c76e313923f6a6655ad69209070e8333ca360678 100644 (file)
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -26,7 +26,7 @@ The ref names and their object names of fetched refs are stored
 in `.git/FETCH_HEAD`.  This information is left for a later merge
 operation done by 'git merge'.
 
 in `.git/FETCH_HEAD`.  This information is left for a later merge
 operation done by 'git merge'.
 

-When <refspec> stores the fetched result in tracking branches,
+When <refspec> stores the fetched result in remote-tracking branches,

 the tags that point at these branches are automatically
 followed.  This is done by first fetching from the remote using
 the given <refspec>s, and if the repository has objects that are
 the tags that point at these branches are automatically
 followed.  This is done by first fetching from the remote using
 the given <refspec>s, and if the repository has objects that are

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 33e8438880e52059f12b26132fe30ddce88bfeeb..54e7013bab1b12d8f7d950bd15fa08a6eea9e1dd 100644 (file)
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -134,7 +134,7 @@ and if there is not any such variable, the value on `URL: ` line
 in `$GIT_DIR/remotes/<origin>` file is used.
 
 In order to determine what remote branches to fetch (and
 in `$GIT_DIR/remotes/<origin>` file is used.
 
 In order to determine what remote branches to fetch (and

-optionally store in the tracking branches) when the command is
+optionally store in the remote-tracking branches) when the command is

 run without any refspec parameters on the command line, values
 of the configuration variable `remote.<origin>.fetch` are
 consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>`
 run without any refspec parameters on the command line, values
 of the configuration variable `remote.<origin>.fetch` are
 consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>`


@@ -147,9 +147,9 @@ refs/heads/*:refs/remotes/origin/*
 ------------
 
 A globbing refspec must have a non-empty RHS (i.e. must store
 ------------
 
 A globbing refspec must have a non-empty RHS (i.e. must store

-what were fetched in tracking branches), and its LHS and RHS
+what were fetched in remote-tracking branches), and its LHS and RHS

 must end with `/*`.  The above specifies that all remote
 must end with `/*`.  The above specifies that all remote

-branches are tracked using tracking branches in
+branches are tracked using remote-tracking branches in

 `refs/remotes/origin/` hierarchy under the same name.
 
 The rule to determine which remote branch to merge after
 `refs/remotes/origin/` hierarchy under the same name.
 
 The rule to determine which remote branch to merge after

diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 5e4989db56e7e2664a0141c3d9ffa1b3e0524185..c258ea48dbb8889a48f3075ab171ebddfd7fda3b 100644 (file)
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -146,7 +146,7 @@ With `-n` option, the remote heads are not queried first with
 
 'prune'::
 
 
 'prune'::
 

-Deletes all stale tracking branches under <name>.
+Deletes all stale remote-tracking branches under <name>.

 These stale branches have already been removed from the remote repository
 referenced by <name>, but are still locally available in
 "remotes/<name>".
 These stale branches have already been removed from the remote repository
 referenced by <name>, but are still locally available in
 "remotes/<name>".

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 31c78a81e094ffc8a66639119eadefbd1e760e35..8b169e364a32afe7d2ff3fa8ae54121ed44e3788 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -177,7 +177,7 @@ On Automatic following
 ~~~~~~~~~~~~~~~~~~~~~~
 
 If you are following somebody else's tree, you are most likely
 ~~~~~~~~~~~~~~~~~~~~~~
 
 If you are following somebody else's tree, you are most likely

-using tracking branches (`refs/heads/origin` in traditional
+using remote-tracking branches (`refs/heads/origin` in traditional

 layout, or `refs/remotes/origin/master` in the separate-remote
 layout).  You usually want the tags from the other end.
 
 layout, or `refs/remotes/origin/master` in the separate-remote
 layout).  You usually want the tags from the other end.
 


@@ -232,7 +232,7 @@ this case.
 It may well be that among networking people, they may want to
 exchange the tags internal to their group, but in that workflow
 they are most likely tracking with each other's progress by
 It may well be that among networking people, they may want to
 exchange the tags internal to their group, but in that workflow
 they are most likely tracking with each other's progress by

-having tracking branches.  Again, the heuristic to automatically
+having remote-tracking branches.  Again, the heuristic to automatically

 follow such tags is a good thing.
 
 
 follow such tags is a good thing.
 
 

diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 1f029f8aa080c4de6323e8b4905a81fa7e8e2046..f04b48ef0d482f03f186d749768da246aabcd1db 100644 (file)
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -131,7 +131,7 @@ to point at the new commit.
        you have. In such these cases, you do not make a new <<def_merge,merge>>
        <<def_commit,commit>> but instead just update to his
        revision. This will happen frequently on a
        you have. In such these cases, you do not make a new <<def_merge,merge>>
        <<def_commit,commit>> but instead just update to his
        revision. This will happen frequently on a

-       <<def_tracking_branch,tracking branch>> of a remote
+       <<def_remote_tracking_branch,remote-tracking branch>> of a remote

        <<def_repository,repository>>.
 
 [[def_fetch]]fetch::
        <<def_repository,repository>>.
 
 [[def_fetch]]fetch::


@@ -260,7 +260,7 @@ This commit is referred to as a "merge commit", or sometimes just a
        The default upstream <<def_repository,repository>>. Most projects have
        at least one upstream project which they track. By default
        'origin' is used for that purpose. New upstream updates
        The default upstream <<def_repository,repository>>. Most projects have
        at least one upstream project which they track. By default
        'origin' is used for that purpose. New upstream updates

-       will be fetched into remote <<def_tracking_branch,tracking branches>> named
+       will be fetched into remote <<def_remote_tracking_branch,remote-tracking branches>> named

        origin/name-of-upstream-branch, which you can see using
        `git branch -r`.
 
        origin/name-of-upstream-branch, which you can see using
        `git branch -r`.
 


@@ -349,6 +349,14 @@ This commit is referred to as a "merge commit", or sometimes just a
        master branch head as to-upstream branch at $URL". See also
        linkgit:git-push[1].
 
        master branch head as to-upstream branch at $URL". See also
        linkgit:git-push[1].
 

+[[def_remote_tracking_branch]]remote-tracking branch::
+       A regular git <<def_branch,branch>> that is used to follow changes from
+       another <<def_repository,repository>>. A remote-tracking
+       branch should not contain direct modifications or have local commits
+       made to it. A remote-tracking branch can usually be
+       identified as the right-hand-side <<def_ref,ref>> in a Pull:
+       <<def_refspec,refspec>>.
+

 [[def_repository]]repository::
        A collection of <<def_ref,refs>> together with an
        <<def_object_database,object database>> containing all objects
 [[def_repository]]repository::
        A collection of <<def_ref,refs>> together with an
        <<def_object_database,object database>> containing all objects


@@ -418,14 +426,6 @@ This commit is referred to as a "merge commit", or sometimes just a
        that each contain very well defined concepts or small incremental yet
        related changes.
 
        that each contain very well defined concepts or small incremental yet
        related changes.
 

-[[def_tracking_branch]]tracking branch::
-       A regular git <<def_branch,branch>> that is used to follow changes from
-       another <<def_repository,repository>>. A tracking
-       branch should not contain direct modifications or have local commits
-       made to it. A tracking branch can usually be
-       identified as the right-hand-side <<def_ref,ref>> in a Pull:
-       <<def_refspec,refspec>>.
-

 [[def_tree]]tree::
        Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree
        object>> together with the dependent <<def_blob_object,blob>> and tree objects
 [[def_tree]]tree::
        Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree
        object>> together with the dependent <<def_blob_object,blob>> and tree objects

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index d5505e88018d7e59f66ec8cee94b77adca2469ac..d7835ca39e8a842a83a8ece0cf044d06b74924b5 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -435,7 +435,7 @@ linux-nfs/master
 origin/master
 -------------------------------------------------
 
 origin/master
 -------------------------------------------------
 

-If you run "git fetch <remote>" later, the tracking branches for the
+If you run "git fetch <remote>" later, the remote-tracking branches for the

 named <remote> will be updated.
 
 If you examine the file .git/config, you will see that git has added
 named <remote> will be updated.
 
 If you examine the file .git/config, you will see that git has added

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 9a934af74bce0983528cc29af5e73a812d7af417..1fa9ce43f548da542ec2e93c8d75fdd3d78131b2 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -784,7 +784,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
         *   between A and B, A...B names that merge base.
         *
         *   With no paths, if <something> is _not_ a commit, no -t nor -b
         *   between A and B, A...B names that merge base.
         *
         *   With no paths, if <something> is _not_ a commit, no -t nor -b

-        *   was given, and there is a tracking branch whose name is
+        *   was given, and there is a remote-tracking branch whose name is

         *   <something> in one and only one remote, then this is a short-hand
         *   to fork local <something> from that remote-tracking branch.
         *
         *   <something> in one and only one remote, then this is a short-hand
         *   to fork local <something> from that remote-tracking branch.
         *

diff --git a/builtin/fetch.c b/builtin/fetch.c
index d35f000c034964ed600b1d8d45e2ef9260abcfb6..3b0b614375edb2520b796ac2128b53dff00d6e73 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -52,7 +52,7 @@ static struct option builtin_fetch_options[] = {
        OPT_SET_INT('n', NULL, &tags,
                    "do not fetch all tags (--no-tags)", TAGS_UNSET),
        OPT_BOOLEAN('p', "prune", &prune,
        OPT_SET_INT('n', NULL, &tags,
                    "do not fetch all tags (--no-tags)", TAGS_UNSET),
        OPT_BOOLEAN('p', "prune", &prune,

-                   "prune tracking branches no longer on remote"),
+                   "prune remote-tracking branches no longer on remote"),

        OPT_BOOLEAN(0, "dry-run", &dry_run,
                    "dry run"),
        OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),
        OPT_BOOLEAN(0, "dry-run", &dry_run,
                    "dry run"),
        OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"),


@@ -98,7 +98,7 @@ static void add_merge_config(struct ref **head,
                        continue;
 
                /*
                        continue;
 
                /*

-                * Not fetched to a tracking branch?  We need to fetch
+                * Not fetched to a remote-tracking branch?  We need to fetch

                 * it anyway to allow this branch's "branch.$name.merge"
                 * to be honored by 'git pull', but we do not have to
                 * fail if branch.$name.merge is misconfigured to point
                 * it anyway to allow this branch's "branch.$name.merge"
                 * to be honored by 'git pull', but we do not have to
                 * fail if branch.$name.merge is misconfigured to point

diff --git a/remote.c b/remote.c
index 9143ec7a1772c45b6c3d4c84f6fc000040400dee..ca42a126ad04514f0ed8378768ebce98cfc5a659 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -493,7 +493,7 @@ static void read_config(void)
 }
 
 /*
 }
 
 /*

- * We need to make sure the tracking branches are well formed, but a
+ * We need to make sure the remote-tracking branches are well formed, but a

  * wildcard refspec in "struct refspec" must have a trailing slash. We
  * temporarily drop the trailing '/' while calling check_ref_format(),
  * and put it back.  The caller knows that a CHECK_REF_FORMAT_ONELEVEL
  * wildcard refspec in "struct refspec" must have a trailing slash. We
  * temporarily drop the trailing '/' while calling check_ref_format(),
  * and put it back.  The caller knows that a CHECK_REF_FORMAT_ONELEVEL