From: Eric Wong Date: Mon, 5 Nov 2007 11:21:48 +0000 (-0800) Subject: git-svn: t9114: verify merge commit message in test X-Git-Tag: v1.5.3.6~42 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fb159580a1628947f0a088e24cfe6fe4c81d99d0;p=git.git git-svn: t9114: verify merge commit message in test It's possible that we end up with an incorrect commit message in this test after making changes to fix the clobber bug in dcommit. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- 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