Browse Source

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>
maint
Eric Wong 17 years ago committed by Junio C Hamano
parent
commit
fb159580a1
  1. 5
      t/t9114-git-svn-dcommit-merge.sh

5
t/t9114-git-svn-dcommit-merge.sh

@ -86,4 +86,9 @@ test_expect_success 'verify post-merge ancestry' " @@ -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…
Cancel
Save