Skip to content

Commit 1393123

Browse files
moygitster
moy
authored and
gitster
committed
Change incorrect "remote branch" to "remote tracking branch" in C code
(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>
1 parent 29b9a66 commit 1393123

File tree

10 files changed

+20
-18
lines changed

10 files changed

+20
-18
lines changed

‎branch.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ void create_branch(const char *head, const char *name, const char *start_name,
2222
void remove_branch_state(void);
2323

2424
/*
25-
* Configure local branch "local" to merge remote branch "remote"
26-
* taken from origin "origin".
25+
* Configure local branch "local" as downstream to branch "remote"
26+
* from remote "origin". Used by git branch --set-upstream.
2727
*/
2828
#define BRANCH_CONFIG_VERBOSE 01
2929
extern void install_branch_config(int flag, const char *local, const char *origin, const char *remote);

‎builtin/fetch.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
359359
what = rm->name + 10;
360360
}
361361
else if (!prefixcmp(rm->name, "refs/remotes/")) {
362-
kind = "remote branch";
362+
kind = "remote-tracking branch";
363363
what = rm->name + 13;
364364
}
365365
else {

‎builtin/fmt-merge-msg.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ static int handle_line(char *line)
100100
origin = line;
101101
string_list_append(&src_data->tag, origin + 4);
102102
src_data->head_status |= 2;
103-
} else if (!prefixcmp(line, "remote branch ")) {
104-
origin = line + 14;
103+
} else if (!prefixcmp(line, "remote-tracking branch ")) {
104+
origin = line + strlen("remote-tracking branch ");
105105
string_list_append(&src_data->r_branch, origin);
106106
src_data->head_status |= 2;
107107
} else {
@@ -233,7 +233,7 @@ static void do_fmt_merge_msg_title(struct strbuf *out,
233233
if (src_data->r_branch.nr) {
234234
strbuf_addstr(out, subsep);
235235
subsep = ", ";
236-
print_joined("remote branch ", "remote branches ",
236+
print_joined("remote-tracking branch ", "remote-tracking branches ",
237237
&src_data->r_branch, out);
238238
}
239239
if (src_data->tag.nr) {

‎builtin/merge.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
403403
goto cleanup;
404404
}
405405
if (!prefixcmp(found_ref, "refs/remotes/")) {
406-
strbuf_addf(msg, "%s\t\tremote branch '%s' of .\n",
406+
strbuf_addf(msg, "%s\t\tremote-tracking branch '%s' of .\n",
407407
sha1_to_hex(branch_head), remote);
408408
goto cleanup;
409409
}

‎builtin/remote.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ static int add_branch_for_removal(const char *refname,
507507
return 0;
508508
}
509509

510-
/* don't delete non-remote refs */
510+
/* don't delete non-remote-tracking refs */
511511
if (prefixcmp(refname, "refs/remotes")) {
512512
/* advise user how to delete local branches */
513513
if (!prefixcmp(refname, "refs/heads/"))
@@ -791,9 +791,9 @@ static int rm(int argc, const char **argv)
791791

792792
if (skipped.nr) {
793793
fprintf(stderr, skipped.nr == 1 ?
794-
"Note: A non-remote branch was not removed; "
794+
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
795795
"to delete it, use:\n" :
796-
"Note: Non-remote branches were not removed; "
796+
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
797797
"to delete them, use:\n");
798798
for (i = 0; i < skipped.nr; i++)
799799
fprintf(stderr, " git branch -d %s\n",

‎contrib/examples/builtin-fetch--tool.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static int append_fetch_head(FILE *fp,
148148
what = remote_name + 10;
149149
}
150150
else if (!strncmp(remote_name, "refs/remotes/", 13)) {
151-
kind = "remote branch";
151+
kind = "remote-tracking branch";
152152
what = remote_name + 13;
153153
}
154154
else {

‎t/t1507-rev-parse-upstream.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ test_expect_success 'merge my-side@{u} records the correct name' '
8585
git branch -t new my-side@{u} &&
8686
git merge -s ours new@{u} &&
8787
git show -s --pretty=format:%s >actual &&
88-
echo "Merge remote branch ${sq}origin/side${sq}" >expect &&
88+
echo "Merge remote-tracking branch ${sq}origin/side${sq}" >expect &&
8989
test_cmp expect actual
9090
)
9191
'

‎t/t3409-rebase-preserve-merges.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ test_expect_success 'rebase -p fakes interactive rebase' '
7272
git fetch &&
7373
git rebase -p origin/topic &&
7474
test 1 = $(git rev-list --all --pretty=oneline | grep "Modify A" | wc -l) &&
75-
test 1 = $(git rev-list --all --pretty=oneline | grep "Merge remote branch " | wc -l)
75+
test 1 = $(git rev-list --all --pretty=oneline | grep "Merge remote-tracking branch " | wc -l)
7676
)
7777
'
7878

‎t/t5505-remote.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,18 @@ test_expect_success 'remove remote' '
107107
)
108108
'
109109

110-
test_expect_success 'remove remote protects non-remote branches' '
110+
test_expect_success 'remove remote protects local branches' '
111111
(
112112
cd test &&
113113
{ cat >expect1 <<EOF
114-
Note: A non-remote branch was not removed; to delete it, use:
114+
Note: A branch outside the refs/remotes/ hierarchy was not removed;
115+
to delete it, use:
115116
git branch -d master
116117
EOF
117118
} &&
118119
{ cat >expect2 <<EOF
119-
Note: Non-remote branches were not removed; to delete them, use:
120+
Note: Some branches outside the refs/remotes/ hierarchy were not removed;
121+
to delete them, use:
120122
git branch -d foobranch
121123
git branch -d master
122124
EOF

‎t/t7608-merge-messages.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ test_expect_success 'ambiguous tag' '
4747
check_oneline "Merge commit QambiguousQ"
4848
'
4949

50-
test_expect_success 'remote branch' '
50+
test_expect_success 'remote-tracking branch' '
5151
git checkout -b remote master &&
5252
test_commit remote-1 &&
5353
git update-ref refs/remotes/origin/master remote &&
5454
git checkout master &&
5555
test_commit master-5 &&
5656
git merge origin/master &&
57-
check_oneline "Merge remote branch Qorigin/masterQ"
57+
check_oneline "Merge remote-tracking branch Qorigin/masterQ"
5858
'
5959

6060
test_done

0 commit comments

Comments
 (0)