git-svn: t9114: verify merge commit message in test

Eric Wong · gitster · commit fb159580a162 · 2007-11-05T12:58:39.000-08:00
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 &lt;normalperson@yhbt.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -86,4 +86,9 @@ test_expect_success 'verify post-merge ancestry' "`
`86`	`86`	`git cat-file commit refs/heads/svn^ \| grep '^friend$'`
`87`	`87`	`"`
`88`	`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`	`+`
`89`	`94`	`test_done`