X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7608-merge-messages.sh;h=28d56797b17d5b1426d6c7c36e37b956731f1dfd;hb=a42332c21723fde9f36b579f6b39a23aa1aac137;hp=9d10583916d42092eaee29fbcafc73b1c827773b;hpb=ce0646184696ae6d87c0e243d058cf5df6459c4f;p=git.git

diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 9d1058391..28d56797b 100755
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -38,7 +38,7 @@ test_expect_success 'merge tag' '
 	check_oneline "Merge commit Qtag-1Q"
 '
 
-test_expect_failure 'ambiguous tag' '
+test_expect_success 'ambiguous tag' '
 	git checkout -b ambiguous master &&
 	test_commit ambiguous &&
 	git checkout master &&
@@ -47,4 +47,14 @@ test_expect_failure 'ambiguous tag' '
 	check_oneline "Merge commit QambiguousQ"
 '
 
+test_expect_success 'remote 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"
+'
+
 test_done