mirror of
https://github.com/git/git.git
synced 2024-11-19 00:34:00 +01:00
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>
This commit is contained in:
parent
c74d9acf20
commit
fb159580a1
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user