From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <sbeller@google.com>, Paul Tan <pyokagan@gmail.com>
Subject: [PATCH v2 01/12] t4150: am.messageid really adds the message id
Date: Tue, 7 Jul 2015 22:08:23 +0800 [thread overview]
Message-ID: <1436278114-28057-2-git-send-email-pyokagan@gmail.com> (raw)
In-Reply-To: <1436278114-28057-1-git-send-email-pyokagan@gmail.com>
Since a078f73 (git-am: add --message-id/--no-message-id, 2014-11-25),
the am.messageid setting determines whether the --message-id option is
set by default.
Add a test for this.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
Notes:
v2
* don't use "git checkout -f" as it does not discard unmerged entries.
Use "git reset --hard" instead.
t/t4150-am.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index b822a39..264f53f 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -563,6 +563,18 @@ test_expect_success 'am --message-id really adds the message id' '
test_cmp expected actual
'
+test_expect_success 'am.messageid really adds the message id' '
+ rm -fr .git/rebase-apply &&
+ git reset --hard &&
+ git checkout HEAD^ &&
+ test_config am.messageid true &&
+ git am patch1.eml &&
+ test_path_is_missing .git/rebase-apply &&
+ git cat-file commit HEAD | tail -n1 >actual &&
+ grep Message-Id patch1.eml >expected &&
+ test_cmp expected actual
+'
+
test_expect_success 'am --message-id -s signs off after the message id' '
rm -fr .git/rebase-apply &&
git reset --hard &&
--
2.5.0.rc1.76.gf60a929
next prev parent reply other threads:[~2015-07-07 14:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 14:08 [PATCH v2 00/12] Improve git-am test coverage Paul Tan
2015-07-07 14:08 ` Paul Tan [this message]
2015-07-07 14:08 ` [PATCH v2 02/12] t4150: am fails if index is dirty Paul Tan
2015-07-07 14:08 ` [PATCH v2 03/12] t4151: am --abort will keep dirty index intact Paul Tan
2015-07-07 14:08 ` [PATCH v2 04/12] t4150: am refuses patches when paused Paul Tan
2015-07-07 14:08 ` [PATCH v2 05/12] t4150: am --resolved fails if index has no changes Paul Tan
2015-07-07 14:08 ` [PATCH v2 06/12] t4150: am --resolved fails if index has unmerged entries Paul Tan
2015-07-07 14:08 ` [PATCH v2 07/12] t4150: am with applypatch-msg hook Paul Tan
2015-07-07 14:08 ` [PATCH v2 08/12] t4150: am with pre-applypatch hook Paul Tan
2015-07-07 14:08 ` [PATCH v2 09/12] t4150: am with post-applypatch hook Paul Tan
2015-07-07 14:08 ` [PATCH v2 10/12] t4150: tests for am --[no-]scissors Paul Tan
2015-07-07 14:08 ` [PATCH v2 11/12] t3418: non-interactive rebase --continue with rerere enabled Paul Tan
2015-07-07 14:08 ` [PATCH v2 12/12] t3901: test git-am encoding conversion Paul Tan
2015-07-07 18:34 ` [PATCH v2 00/12] Improve git-am test coverage Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436278114-28057-2-git-send-email-pyokagan@gmail.com \
--to=pyokagan@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=sbeller@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).