From: Eric Wong Date: Mon, 05 Nov 2007 11:21:48 GMT Subject: [PATCH 2/2] git-svn: t9114: verify merge commit message in test Message-ID: <1194261708-32256-2-git-send-email-normalperson@yhbt.net> In-Reply-To: <1194261708-32256-1-git-send-email-normalperson@yhbt.net> 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 --- 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 d6ca955..225060b 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 -- 1.5.3.5.566.gc207