{"thread":{"id":"34334","subject":"[PATCH] Change \"remote tracking\" to \"remote-tracking\"","startedAt":"2013-07-03T09:12:34Z","lastAt":"2013-07-04T09:05:12Z","messageCount":6,"participants":["Michael Schubert","Johan Herland","Jonathan Nieder","Junio C Hamano","Pete Wyckoff"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"222450","messageId":"1372842754-13366-1-git-send-email-mschub@elegosoft.com","threadId":"34334","inReplyTo":null,"subject":"[PATCH] Change \"remote tracking\" to \"remote-tracking\"","fromName":"Michael Schubert","fromEmail":"mschub@elegosoft.com","sentAt":"2013-07-03T09:12:34Z","receivedAt":"2013-07-03T09:12:34Z","isPatch":true,"sender":{"key":"mschub@elegosoft.com","avatar":null},"body":"Fix a typo (\"remote remote-tracking\") going back to the big cleanup\nin 2010 (8b3f3f84 etc). Also, remove some more occurrences of\n\"tracking\" and \"remote tracking\" in favor of \"remote-tracking\".\n\nSigned-off-by: Michael Schubert \n---\n Documentation/git-p4.txt | 2 +-\n Documentation/git-submodule.txt | 2 +-\n Documentation/glossary-content.txt | 4 ++--\n builtin/clone.c | 2 +-\n builtin/merge.c | 4 ++--\n t/t5505-remote.sh | 2 +-\n 6 files changed, 8 insertions(+), 8 deletions(-)\n\ndiff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt\nindex c579fbc..609c1d2 100644\n--- a/Documentation/git-p4.txt\n+++ b/Documentation/git-p4.txt\n@@ -180,7 +180,7 @@ subsequent 'sync' operations.\n \tImport changes into given branch. If the branch starts with\n \t'refs/', it will be used as is. Otherwise if it does not start\n \twith 'p4/', that prefix is added. The branch is assumed to\n-\tname a remote tracking, but this can be modified using\n+\tname a remote-tracking, but this can be modified using\n \t'--import-local', or by giving a full ref name. The default\n \tbranch is 'master'.\n +\ndiff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt\nindex e576713..bfff090 100644\n--- a/Documentation/git-submodule.txt\n+++ b/Documentation/git-submodule.txt\n@@ -262,7 +262,7 @@ OPTIONS\n --remote::\n \tThis option is only valid for the update command. Instead of using\n \tthe superproject's recorded SHA-1 to update the submodule, use the\n-\tstatus of the submodule's remote tracking branch. The remote used\n+\tstatus of the submodule's remote-tracking branch. The remote used\n \tis branch's remote (`branch..remote`), defaulting to `origin`.\n \tThe remote branch used defaults to `master`, but the branch name may\n \tbe overridden by setting the `submodule..branch` option in\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex db2a74d..dba5062 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -113,7 +113,7 @@ Note that commands that operate on the history of the current branch\n while the HEAD is detached. They update the HEAD to point at the tip\n of the updated history without affecting any branch. Commands that\n update or inquire information _about_ the current branch (e.g. `git\n-branch --set-upstream-to` that sets what remote tracking branch the\n+branch --set-upstream-to` that sets what remote-tracking branch the\n current branch integrates with) obviously do not work, as there is no\n (real) current branch to ask about in this state.\n \n@@ -267,7 +267,7 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n \tThe default upstream <>. Most projects have\n \tat least one upstream project which they track. By default\n \t'origin' is used for that purpose. New upstream updates\n-\twill be fetched into remote <> named\n+\twill be fetched into <> named\n \torigin/name-of-upstream-branch, which you can see using\n \t`git branch -r`.\n \ndiff --git a/builtin/clone.c b/builtin/clone.c\nindex 14b1323..17f57cd 100644\n--- a/builtin/clone.c\n+++ b/builtin/clone.c\n@@ -701,7 +701,7 @@ static void write_refspec_config(const char* src_ref_prefix,\n \t\t\t/*\n \t\t\t * otherwise, the next \"git fetch\" will\n \t\t\t * simply fetch from HEAD without updating\n-\t\t\t * any remote tracking branch, which is what\n+\t\t\t * any remote-tracking branch, which is what\n \t\t\t * we want.\n \t\t\t */\n \t\t} else {\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex 2ebe732..bad4536 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -948,7 +948,7 @@ static int evaluate_result(void)\n }\n \n /*\n- * Pretend as if the user told us to merge with the tracking\n+ * Pretend as if the user told us to merge with the remote-tracking\n * branch we have for the upstream of the current branch\n */\n static int setup_with_upstream(const char ***argv)\n@@ -967,7 +967,7 @@ static int setup_with_upstream(const char ***argv)\n \targs = xcalloc(branch->merge_nr + 1, sizeof(char *));\n \tfor (i = 0; i < branch->merge_nr; i++) {\n \t\tif (!branch->merge[i]->dst)\n-\t\t\tdie(_(\"No remote tracking branch for %s from %s\"),\n+\t\t\tdie(_(\"No remote-tracking branch for %s from %s\"),\n \t\t\t branch->merge[i]->src, branch->remote_name);\n \t\targs[i] = branch->merge[i]->dst;\n \t}\ndiff --git a/t/t5505-remote.sh b/t/t5505-remote.sh\nindex ee5d65d..8f6e392 100755\n--- a/t/t5505-remote.sh\n+++ b/t/t5505-remote.sh\n@@ -74,7 +74,7 @@ test_expect_success 'add another remote' '\n \t)\n '\n \n-test_expect_success C_LOCALE_OUTPUT 'check remote tracking' '\n+test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '\n \t(\n \t\tcd test &&\n \t\tcheck_remote_track origin master side &&\n-- \n1.8.3.2.860.gf7f8a72\n"},{"id":"222454","messageId":"CALKQrge-ioMp_YxcEng+h3OcVMtQXFBFbZu=Z8+rwoiEDi7qmA@mail.gmail.com","threadId":"34334","inReplyTo":"1372842754-13366-1-git-send-email-mschub@elegosoft.com","subject":"Re: [PATCH] Change \"remote tracking\" to \"remote-tracking\"","fromName":"Johan Herland","fromEmail":"johan@herland.net","sentAt":"2013-07-03T10:02:30Z","receivedAt":"2013-07-03T10:02:30Z","isPatch":true,"sender":{"key":"johan@herland.net","avatar":"https://avatars.githubusercontent.com/u/547031?v=4"},"body":"On Wed, Jul 3, 2013 at 11:12 AM, Michael Schubert wrote:\n> Fix a typo (\"remote remote-tracking\") going back to the big cleanup\n> in 2010 (8b3f3f84 etc). Also, remove some more occurrences of\n> \"tracking\" and \"remote tracking\" in favor of \"remote-tracking\".\n>\n> Signed-off-by: Michael Schubert \n\nReviewed-by: Johan Herland \n\n-- \nJohan Herland, \nwww.herland.net\n"},{"id":"222480","messageId":"20130703183851.GR408@google.com","threadId":"34334","inReplyTo":"1372842754-13366-1-git-send-email-mschub@elegosoft.com","subject":"Re: [PATCH] Change \"remote tracking\" to \"remote-tracking\"","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-07-03T18:38:51Z","receivedAt":"2013-07-03T18:38:51Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Michael Schubert wrote:\n\n> --- a/Documentation/git-p4.txt\n> +++ b/Documentation/git-p4.txt\n> @@ -180,7 +180,7 @@ subsequent 'sync' operations.\n> \tImport changes into given branch. If the branch starts with\n> \t'refs/', it will be used as is. Otherwise if it does not start\n> \twith 'p4/', that prefix is added. The branch is assumed to\n> -\tname a remote tracking, but this can be modified using\n> +\tname a remote-tracking, but this can be modified using\n> \t'--import-local', or by giving a full ref name. The default\n> \tbranch is 'master'.\n\nThis is confusing both before and after the patch. What is \"a remote\ntracking\"?\n\nPerhaps:\n\n\t--branch ::\n\t\tImport changes into instead of refs/remotes/p4/master.\n\t\tIf starts with refs/, it is used as is. Otherwise, if\n\t\tit does not start with p4/, that prefix is added.\n\t+\n\tBy default a not starting with refs/ is treated as the\n\tname of a remote-tracking branch (under refs/remotes/). This\n\tbehavior can be modified using the --import-local option.\n\t+\n\tThe default is \"master\".\n\nThe rest of the patch looks good.\n\nThanks,\nJonathan\n"},{"id":"222498","messageId":"7vy59ncrjk.fsf@alter.siamese.dyndns.org","threadId":"34334","inReplyTo":"20130703183851.GR408@google.com","subject":"Re: [PATCH] Change \"remote tracking\" to \"remote-tracking\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-07-03T20:33:19Z","receivedAt":"2013-07-03T20:33:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> Michael Schubert wrote:\n>\n>> --- a/Documentation/git-p4.txt\n>> +++ b/Documentation/git-p4.txt\n>> @@ -180,7 +180,7 @@ subsequent 'sync' operations.\n>> \tImport changes into given branch. If the branch starts with\n>> \t'refs/', it will be used as is. Otherwise if it does not start\n>> \twith 'p4/', that prefix is added. The branch is assumed to\n>> -\tname a remote tracking, but this can be modified using\n>> +\tname a remote-tracking, but this can be modified using\n>> \t'--import-local', or by giving a full ref name. The default\n>> \tbranch is 'master'.\n>\n> This is confusing both before and after the patch. What is \"a remote\n> tracking\"?\n>\n> Perhaps:\n>\n> \t--branch ::\n> \t\tImport changes into instead of refs/remotes/p4/master.\n> \t\tIf starts with refs/, it is used as is. Otherwise, if\n> \t\tit does not start with p4/, that prefix is added.\n> \t+\n> \tBy default a not starting with refs/ is treated as the\n> \tname of a remote-tracking branch (under refs/remotes/). This\n> \tbehavior can be modified using the --import-local option.\n> \t+\n> \tThe default is \"master\".\n>\n> The rest of the patch looks good.\n\nMyy reading did hiccup at the same \"remote-tracking\" used as if it\nwere a noun, and your rewritten version reads much better.\n\nThanks.\n"},{"id":"222514","messageId":"20130703224336.GA3702@padd.com","threadId":"34334","inReplyTo":"7vy59ncrjk.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Change \"remote tracking\" to \"remote-tracking\"","fromName":"Pete Wyckoff","fromEmail":"pw@padd.com","sentAt":"2013-07-03T22:43:36Z","receivedAt":"2013-07-03T22:43:36Z","isPatch":true,"sender":{"key":"pw@padd.com","avatar":null},"body":"gitster@pobox.com wrote on Wed, 03 Jul 2013 13:33 -0700:\n> Jonathan Nieder writes:\n> \n> > Michael Schubert wrote:\n> >\n> >> --- a/Documentation/git-p4.txt\n> >> +++ b/Documentation/git-p4.txt\n> >> @@ -180,7 +180,7 @@ subsequent 'sync' operations.\n> >> \tImport changes into given branch. If the branch starts with\n> >> \t'refs/', it will be used as is. Otherwise if it does not start\n> >> \twith 'p4/', that prefix is added. The branch is assumed to\n> >> -\tname a remote tracking, but this can be modified using\n> >> +\tname a remote-tracking, but this can be modified using\n> >> \t'--import-local', or by giving a full ref name. The default\n> >> \tbranch is 'master'.\n> >\n> > This is confusing both before and after the patch. What is \"a remote\n> > tracking\"?\n> >\n> > Perhaps:\n> >\n> > \t--branch ::\n> > \t\tImport changes into instead of refs/remotes/p4/master.\n> > \t\tIf starts with refs/, it is used as is. Otherwise, if\n> > \t\tit does not start with p4/, that prefix is added.\n> > \t+\n> > \tBy default a not starting with refs/ is treated as the\n> > \tname of a remote-tracking branch (under refs/remotes/). This\n> > \tbehavior can be modified using the --import-local option.\n> > \t+\n> > \tThe default is \"master\".\n> >\n> > The rest of the patch looks good.\n> \n> Myy reading did hiccup at the same \"remote-tracking\" used as if it\n> were a noun, and your rewritten version reads much better.\n\nYes, very clear and complete rewrite; thanks. The final\nparagraph is perhaps duplicative of the first sentence, but adds\nclarity, so I'm happy as it stands.\n\nAcked-by: Pete Wyckoff \n\n\t\t-- Pete\n"},{"id":"222535","messageId":"20130704090511.GA5317@pc","threadId":"34334","inReplyTo":"20130703183851.GR408@google.com","subject":"Re: [PATCH] Change \"remote tracking\" to \"remote-tracking\"","fromName":"Michael Schubert","fromEmail":"mschub@elegosoft.com","sentAt":"2013-07-04T09:05:12Z","receivedAt":"2013-07-04T09:05:12Z","isPatch":true,"sender":{"key":"mschub@elegosoft.com","avatar":null},"body":"On Wed, Jul 03, 2013 at 11:38:51AM -0700, Jonathan Nieder wrote:\n> Michael Schubert wrote:\n> \n> > --- a/Documentation/git-p4.txt\n> > +++ b/Documentation/git-p4.txt\n> > @@ -180,7 +180,7 @@ subsequent 'sync' operations.\n> > \tImport changes into given branch. If the branch starts with\n> > \t'refs/', it will be used as is. Otherwise if it does not start\n> > \twith 'p4/', that prefix is added. The branch is assumed to\n> > -\tname a remote tracking, but this can be modified using\n> > +\tname a remote-tracking, but this can be modified using\n> > \t'--import-local', or by giving a full ref name. The default\n> > \tbranch is 'master'.\n> \n> This is confusing both before and after the patch. What is \"a remote\n> tracking\"?\n> \n> Perhaps:\n> \n> \t--branch ::\n> \t\tImport changes into instead of refs/remotes/p4/master.\n> \t\tIf starts with refs/, it is used as is. Otherwise, if\n> \t\tit does not start with p4/, that prefix is added.\n> \t+\n> \tBy default a not starting with refs/ is treated as the\n> \tname of a remote-tracking branch (under refs/remotes/). This\n> \tbehavior can be modified using the --import-local option.\n> \t+\n> \tThe default is \"master\".\n\nThanks.\n"}]}