summaryrefslogtreecommitdiff
path: root/t/t1507-rev-parse-upstream.sh
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-11-02 15:31:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-03 16:20:47 (GMT)
commit13931236b9ee2895a98ffdbdacbd0f895956d8a8 (patch)
tree88613be74b32ddbc8c42f4b0eec10d616ff846e2 /t/t1507-rev-parse-upstream.sh
parent29b9a66f285f602ad67362ccbe2c6bfaac769f54 (diff)
downloadgit-13931236b9ee2895a98ffdbdacbd0f895956d8a8.zip
git-13931236b9ee2895a98ffdbdacbd0f895956d8a8.tar.gz
git-13931236b9ee2895a98ffdbdacbd0f895956d8a8.tar.bz2
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>
Diffstat (limited to 't/t1507-rev-parse-upstream.sh')
-rwxr-xr-xt/t1507-rev-parse-upstream.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index 8c8dfda..a455551 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -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
)
'