projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c74d9ac
)
git-svn: t9114: verify merge commit message in test
author
Eric Wong
<normalperson@yhbt.net>
Mon, 5 Nov 2007 11:21:48 +0000
(
03:21
-0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 5 Nov 2007 20:58:39 +0000
(12:58 -0800)
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>
t/t9114-git-svn-dcommit-merge.sh
patch
|
blob
|
history
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