@matheusbsbs / matheus-bagliano / commits / fb159580a1
Fork 0

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 <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Eric Wong committed Nov 5, 2007 at 03:21 UTC fb159580a1628947f0a088e24cfe6fe4c81d99d0
1 file changed +5
t/t9114-git-svn-dcommit-merge.sh
+5
@@ -86,4 +86,9 @@ test_expect_success 'verify post-merge ancestry' "
86 git cat-file commit refs/heads/svn^ | grep '^friend$'
87 "
88
89 +test_expect_success 'verify merge commit message' "
90 + git rev-list --pretty=raw -1 refs/heads/svn | \
91 + grep \" Merge branch 'merge' into svn\"
92 + "
93 +
94 test_done