From: "Jörg Sommer" <joerg@alea.gnuu.de>
To: git@vger.kernel.org
Subject: git-merge adds test to a message -- bug?
Date: Sun, 23 Mar 2008 23:13:31 +0000 (UTC) [thread overview]
Message-ID: <slrnfudp0q.19k.joerg@alea.gnuu.de> (raw)
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.
next reply other threads:[~2008-03-23 23:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-23 23:13 Jörg Sommer [this message]
2008-03-24 5:17 ` git-merge adds test to a message -- bug? Junio C Hamano
2008-03-24 11:08 ` Johannes Schindelin
2008-03-24 16:45 ` Junio C Hamano
2008-03-25 0:12 ` Jörg Sommer
2008-03-25 20:04 ` Johannes Schindelin
2008-04-09 10:40 ` Jörg Sommer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=slrnfudp0q.19k.joerg@alea.gnuu.de \
--to=joerg@alea.gnuu.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).