diff options
| author | Eric Wong <normalperson@yhbt.net> | 2007-11-05 12:21:48 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-05 21:58:39 +0100 |
| commit | fb159580a1628947f0a088e24cfe6fe4c81d99d0 (patch) | |
| tree | 9c60175ae98b1512ffafb9b3f57a522f8aefbe92 /t/t9114-git-svn-dcommit-merge.sh | |
| parent | git-svn: fix dcommit clobbering when committing a series of diffs (diff) | |
| download | git-fb159580a1628947f0a088e24cfe6fe4c81d99d0.tar.xz git-fb159580a1628947f0a088e24cfe6fe4c81d99d0.zip | |
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>
Diffstat (limited to 't/t9114-git-svn-dcommit-merge.sh')
| -rwxr-xr-x | t/t9114-git-svn-dcommit-merge.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh index d6ca955081..225060b88b 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 |