Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sp/fetch-optim'
[gitweb.git]
/
t
/
t9114-git-svn-dcommit-merge.sh
diff --git
a/t/t9114-git-svn-dcommit-merge.sh
b/t/t9114-git-svn-dcommit-merge.sh
index d6ca95508184ef167b068b6e9d57d5d650f69720..225060b88bc7533c02d9acffbe9d4b01f848050e 100755
(executable)
--- 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