Change incorrect "remote branch" to "remote tracking branch" in C code
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Tue, 2 Nov 2010 15:31:25 +0000 (16:31 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Nov 2010 16:20:47 +0000 (09:20 -0700)
(Just like we did for documentation already)

In the process, we change "non-remote branch" to "branch outside the
refs/remotes/ hierarchy" to avoid the ugly "non-remote-tracking branch".
The new formulation actually corresponds to how the code detects this
case (i.e. prefixcmp(refname, "refs/remotes")).

Also, we use 'remote-tracking branch' in generated merge messages (by
merge an fmt-merge-msg).

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
branch.h
builtin/fetch.c
builtin/fmt-merge-msg.c
builtin/merge.c
builtin/remote.c
contrib/examples/builtin-fetch--tool.c
t/t1507-rev-parse-upstream.sh
t/t3409-rebase-preserve-merges.sh
t/t5505-remote.sh
t/t7608-merge-messages.sh

index eed817a64c7620bfe67f395e39b4eef2f85a4ab3..4026e3832b265c4cef6e5bc151976771867b3da9 100644 (file)
--- a/branch.h
+++ b/branch.h
@@ -22,8 +22,8 @@ void create_branch(const char *head, const char *name, const char *start_name,
 void remove_branch_state(void);
 
 /*
- * Configure local branch "local" to merge remote branch "remote"
- * taken from origin "origin".
+ * Configure local branch "local" as downstream to branch "remote"
+ * from remote "origin".  Used by git branch --set-upstream.
  */
 #define BRANCH_CONFIG_VERBOSE 01
 extern void install_branch_config(int flag, const char *local, const char *origin, const char *remote);
index 3b0b614375edb2520b796ac2128b53dff00d6e73..4243ef02232d977f37c34e4bd3b724469ef041a4 100644 (file)
@@ -359,7 +359,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
                        what = rm->name + 10;
                }
                else if (!prefixcmp(rm->name, "refs/remotes/")) {
-                       kind = "remote branch";
+                       kind = "remote-tracking branch";
                        what = rm->name + 13;
                }
                else {
index 78c77742b6e6863b1eb4d61750ae253710223aa2..5189b16c9e59c20b449435c413c34da9f7bf9baa 100644 (file)
@@ -100,8 +100,8 @@ static int handle_line(char *line)
                origin = line;
                string_list_append(&src_data->tag, origin + 4);
                src_data->head_status |= 2;
-       } else if (!prefixcmp(line, "remote branch ")) {
-               origin = line + 14;
+       } else if (!prefixcmp(line, "remote-tracking branch ")) {
+               origin = line + strlen("remote-tracking branch ");
                string_list_append(&src_data->r_branch, origin);
                src_data->head_status |= 2;
        } else {
@@ -233,7 +233,7 @@ static void do_fmt_merge_msg_title(struct strbuf *out,
                if (src_data->r_branch.nr) {
                        strbuf_addstr(out, subsep);
                        subsep = ", ";
-                       print_joined("remote branch ", "remote branches ",
+                       print_joined("remote-tracking branch ", "remote-tracking branches ",
                                        &src_data->r_branch, out);
                }
                if (src_data->tag.nr) {
index 10f091b51960cd6ae913b1c4d2ab9e6931862351..9ec13f14bdcc3996fe18ed6fdf761ec07e627792 100644 (file)
@@ -403,7 +403,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
                        goto cleanup;
                }
                if (!prefixcmp(found_ref, "refs/remotes/")) {
-                       strbuf_addf(msg, "%s\t\tremote branch '%s' of .\n",
+                       strbuf_addf(msg, "%s\t\tremote-tracking branch '%s' of .\n",
                                    sha1_to_hex(branch_head), remote);
                        goto cleanup;
                }
index e9a6e09257f445b1c26833dd9fae89518369daa7..6a062821969d432d681cb810ae7fb775288160a2 100644 (file)
@@ -507,7 +507,7 @@ static int add_branch_for_removal(const char *refname,
                        return 0;
        }
 
-       /* don't delete non-remote refs */
+       /* don't delete non-remote-tracking refs */
        if (prefixcmp(refname, "refs/remotes")) {
                /* advise user how to delete local branches */
                if (!prefixcmp(refname, "refs/heads/"))
@@ -791,9 +791,9 @@ static int rm(int argc, const char **argv)
 
        if (skipped.nr) {
                fprintf(stderr, skipped.nr == 1 ?
-                       "Note: A non-remote branch was not removed; "
+                       "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
                        "to delete it, use:\n" :
-                       "Note: Non-remote branches were not removed; "
+                       "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
                        "to delete them, use:\n");
                for (i = 0; i < skipped.nr; i++)
                        fprintf(stderr, "  git branch -d %s\n",
index cd10dbcbc90ee155e05cffb49e88defcf35c5a59..3140e405fa130a0fa20b2f6ee4171da70935de66 100644 (file)
@@ -148,7 +148,7 @@ static int append_fetch_head(FILE *fp,
                what = remote_name + 10;
        }
        else if (!strncmp(remote_name, "refs/remotes/", 13)) {
-               kind = "remote branch";
+               kind = "remote-tracking branch";
                what = remote_name + 13;
        }
        else {
index 8c8dfdaf9f037f370629f419af02aa7a9d75f613..a4555510c37276d36387d4c5c818503bb286dbd1 100755 (executable)
@@ -85,7 +85,7 @@ test_expect_success 'merge my-side@{u} records the correct name' '
        git branch -t new my-side@{u} &&
        git merge -s ours new@{u} &&
        git show -s --pretty=format:%s >actual &&
-       echo "Merge remote branch ${sq}origin/side${sq}" >expect &&
+       echo "Merge remote-tracking branch ${sq}origin/side${sq}" >expect &&
        test_cmp expect actual
 )
 '
index 74161a42ec34c2d33780a80425ec1be5a4028f03..19341e5ca1c7f415afdf2c82f67930b8fed5478b 100755 (executable)
@@ -72,7 +72,7 @@ test_expect_success 'rebase -p fakes interactive rebase' '
        git fetch &&
        git rebase -p origin/topic &&
        test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
-       test 1 = $(git rev-list --all --pretty=oneline | grep "Merge remote branch " | wc -l)
+       test 1 = $(git rev-list --all --pretty=oneline | grep "Merge remote-tracking branch " | wc -l)
        )
 '
 
index 5d1c66ea7166b0b4d631b681f344e0eefb84d899..d189add2d0afeea9ae29ca6b82a786b55b445217 100755 (executable)
@@ -107,16 +107,18 @@ test_expect_success 'remove remote' '
 )
 '
 
-test_expect_success 'remove remote protects non-remote branches' '
+test_expect_success 'remove remote protects local branches' '
 (
        cd test &&
        { cat >expect1 <<EOF
-Note: A non-remote branch was not removed; to delete it, use:
+Note: A branch outside the refs/remotes/ hierarchy was not removed;
+to delete it, use:
   git branch -d master
 EOF
        } &&
        { cat >expect2 <<EOF
-Note: Non-remote branches were not removed; to delete them, use:
+Note: Some branches outside the refs/remotes/ hierarchy were not removed;
+to delete them, use:
   git branch -d foobranch
   git branch -d master
 EOF
index 28d56797b17d5b1426d6c7c36e37b956731f1dfd..9225fa6f025cd9586b46f30464a69ccb57ca6b2a 100755 (executable)
@@ -47,14 +47,14 @@ test_expect_success 'ambiguous tag' '
        check_oneline "Merge commit QambiguousQ"
 '
 
-test_expect_success 'remote branch' '
+test_expect_success 'remote-tracking branch' '
        git checkout -b remote master &&
        test_commit remote-1 &&
        git update-ref refs/remotes/origin/master remote &&
        git checkout master &&
        test_commit master-5 &&
        git merge origin/master &&
-       check_oneline "Merge remote branch Qorigin/masterQ"
+       check_oneline "Merge remote-tracking branch Qorigin/masterQ"
 '
 
 test_done