From d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5 Mon Sep 17 00:00:00 2001 From: Michael Schubert Date: Wed, 3 Jul 2013 11:12:34 +0200 Subject: Change "remote tracking" to "remote-tracking" Fix a typo ("remote remote-tracking") going back to the big cleanup in 2010 (8b3f3f84 etc). Also, remove some more occurrences of "tracking" and "remote tracking" in favor of "remote-tracking". Signed-off-by: Michael Schubert Reviewed-by: Johan Herland Signed-off-by: Junio C Hamano --- Documentation/git-p4.txt | 17 ++++++++++------- Documentation/git-submodule.txt | 2 +- Documentation/glossary-content.txt | 4 ++-- builtin/clone.c | 2 +- builtin/merge.c | 4 ++-- t/t5505-remote.sh | 2 +- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index c579fbc2b8..8cba16d67f 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -176,13 +176,16 @@ Sync options These options can be used in the initial 'clone' as well as in subsequent 'sync' operations. ---branch :: - Import changes into given branch. If the branch starts with - 'refs/', it will be used as is. Otherwise if it does not start - with 'p4/', that prefix is added. The branch is assumed to - name a remote tracking, but this can be modified using - '--import-local', or by giving a full ref name. The default - branch is 'master'. +--branch :: + Import changes into instead of refs/remotes/p4/master. + If starts with refs/, it is used as is. Otherwise, if + it does not start with p4/, that prefix is added. ++ +By default a not starting with refs/ is treated as the +name of a remote-tracking branch (under refs/remotes/). This +behavior can be modified using the --import-local option. ++ +The default is "master". + This example imports a new remote "p4/proj2" into an existing Git repository: diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index e5767134b1..bfff09062d 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -262,7 +262,7 @@ OPTIONS --remote:: This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the - status of the submodule's remote tracking branch. The remote used + status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch..remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule..branch` option in diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index db2a74df93..dba5062b37 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -113,7 +113,7 @@ Note that commands that operate on the history of the current branch while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git -branch --set-upstream-to` that sets what remote tracking branch the +branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state. @@ -267,7 +267,7 @@ This commit is referred to as a "merge commit", or sometimes just a The default upstream <>. 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 <> named + will be fetched into <> named origin/name-of-upstream-branch, which you can see using `git branch -r`. diff --git a/builtin/clone.c b/builtin/clone.c index dad4265989..9d98cb5acb 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -697,7 +697,7 @@ static void write_refspec_config(const char* src_ref_prefix, /* * otherwise, the next "git fetch" will * simply fetch from HEAD without updating - * any remote tracking branch, which is what + * any remote-tracking branch, which is what * we want. */ } else { diff --git a/builtin/merge.c b/builtin/merge.c index 3e2daa37c3..622f5db89a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -948,7 +948,7 @@ static int evaluate_result(void) } /* - * Pretend as if the user told us to merge with the tracking + * Pretend as if the user told us to merge with the remote-tracking * branch we have for the upstream of the current branch */ static int setup_with_upstream(const char ***argv) @@ -967,7 +967,7 @@ static int setup_with_upstream(const char ***argv) args = xcalloc(branch->merge_nr + 1, sizeof(char *)); for (i = 0; i < branch->merge_nr; i++) { if (!branch->merge[i]->dst) - die(_("No remote tracking branch for %s from %s"), + die(_("No remote-tracking branch for %s from %s"), branch->merge[i]->src, branch->remote_name); args[i] = branch->merge[i]->dst; } diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index dd10ff053c..8d0f3e3078 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -75,7 +75,7 @@ test_expect_success 'add another remote' ' ) ' -test_expect_success C_LOCALE_OUTPUT 'check remote tracking' ' +test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' ' ( cd test && check_remote_track origin master side && -- cgit v1.2.3