Merge branch 'maint-1.6.0' into maint

diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 81ced8ac3cc924a8461196cb71d27e9fc3a8f610..28d56797b17d5b1426d6c7c36e37b956731f1dfd 100755 (executable)
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -47,4 +47,14 @@ test_expect_success '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