Skip to content

Commit

Permalink
git-svn: t9114: verify merge commit message in test
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Wong authored and Junio C Hamano committed Nov 5, 2007
1 parent c74d9ac commit fb15958
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions t/t9114-git-svn-dcommit-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit fb15958

Please sign in to comment.