diff options
Diffstat (limited to 't/t7608-merge-messages.sh')
| -rwxr-xr-x | t/t7608-merge-messages.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh index 81ced8ac3c..28d56797b1 100755 --- 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 |