(Just like we did for documentation already)
Signed-off-by: Matthieu Moy <Matthieu.Moy@xxxxxxx>
---
branch.h | 2 +-
builtin/fetch.c | 2 +-
builtin/remote.c | 6 +++---
contrib/examples/builtin-fetch--tool.c | 2 +-
t/t5505-remote.sh | 6 +++---
t/t7608-merge-messages.sh | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/branch.h b/branch.h
index eed817a..2004632 100644
--- a/branch.h
+++ b/branch.h
@@ -22,7 +22,7 @@ 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"
+ * Configure local branch "local" to merge remote-tracking branch "remote"
* taken from origin "origin".
*/
#define BRANCH_CONFIG_VERBOSE 01
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 3b0b614..4243ef0 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -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 {
diff --git a/builtin/remote.c b/builtin/remote.c
index e9a6e09..4149e30 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -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 non-remote-tracking branch was not removed; "
"to delete it, use:\n" :
- "Note: Non-remote branches were not removed; "
+ "Note: Non-remote-tracking branches were not removed; "
"to delete them, use:\n");
for (i = 0; i < skipped.nr; i++)
fprintf(stderr, " git branch -d %s\n",
diff --git a/contrib/examples/builtin-fetch--tool.c b/contrib/examples/builtin-fetch--tool.c
index cd10dbc..3140e40 100644
--- a/contrib/examples/builtin-fetch--tool.c
+++ b/contrib/examples/builtin-fetch--tool.c
@@ -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 {
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 5d1c66e..48eeba3 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -107,16 +107,16 @@ test_expect_success 'remove remote' '
)
'
-test_expect_success 'remove remote protects non-remote branches' '
+test_expect_success 'remove remote protects non-remote-tracking branches' '
(
cd test &&
{ cat >expect1 <<EOF
-Note: A non-remote branch was not removed; to delete it, use:
+Note: A non-remote-tracking branch 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: Non-remote-tracking branches were not removed; to delete them, use:
git branch -d foobranch
git branch -d master
EOF
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 28d5679..1c71296 100755
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -47,7 +47,7 @@ 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 &&
--
1.7.3.2.537.g7e355
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html