X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9114-git-svn-dcommit-merge.sh;h=225060b88bc7533c02d9acffbe9d4b01f848050e;hb=b4a299d87ca7a1d39c699ee2af28305e57f3b0ae;hp=d6ca95508184ef167b068b6e9d57d5d650f69720;hpb=6e863d6d129a1b6a13c66d0bb03f3d43db6c51fe;p=git.git diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh index d6ca95508..225060b88 100755 --- a/t/t9114-git-svn-dcommit-merge.sh +++ b/t/t9114-git-svn-dcommit-merge.sh @@ -86,4 +86,9 @@ test_expect_success 'verify post-merge ancestry' " git cat-file commit refs/heads/svn^ | grep '^friend$' " +test_expect_success 'verify merge commit message' " + git rev-list --pretty=raw -1 refs/heads/svn | \ + grep \" Merge branch 'merge' into svn\" + " + test_done