git-merge adds test to a message -- bug?
Hi,
is it correct, that this test fails?
diff --git a/t/t6032-merge-message.sh b/t/t6032-merge-message.sh
new file mode 100755
index 0000000..97157bd
--- /dev/null
+++ b/t/t6032-merge-message.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+test_description='test for merge message'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ : > file1 &&
+ git add file1 &&
+ test_tick &&
+ git commit -m "commit 1" &&
+ : > file2 &&
+ git add file2 &&
+ test_tick &&
+ git commit -m "commit 2" &&
+
+ git checkout -b new-branch HEAD~1 &&
+ : > file3 &&
+ git add file3 &&
+ test_tick &&
+ git commit -m "commit 3"
+'
+
+test_expect_success merge 'git merge -m master-merge master'
+
+test_expect_failure 'merge message check' '
+ test "$(git cat-file commit HEAD | sed "1,/^\$/d")" = master-merge
+'
+
+test_done
Bye, Jörg.
--
Unsere Zweifel sind Verräter und oft genug verspielen wir den möglichen
Gewinn, weil wir den Versuch nicht wagen.