summaryrefslogtreecommitdiff
path: root/t/t7608-merge-messages.sh
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-11-02 16:31:25 +0100
committerJunio C Hamano <gitster@pobox.com>2010-11-03 09:20:47 -0700
commit13931236b9ee2895a98ffdbdacbd0f895956d8a8 (patch)
tree88613be74b32ddbc8c42f4b0eec10d616ff846e2 /t/t7608-merge-messages.sh
parent29b9a66f285f602ad67362ccbe2c6bfaac769f54 (diff)
downloadgit-13931236b9ee2895a98ffdbdacbd0f895956d8a8.tar.gz
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/t7608-merge-messages.sh')
-rwxr-xr-xt/t7608-merge-messages.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 28d56797b1..9225fa6f02 100755
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -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