From: Paul Tan Date: Thu, 02 Jul 2015 18:16:29 GMT Subject: [PATCH 01/12] t4150: am.messageid really adds the message id Message-ID: <1435861000-25278-2-git-send-email-pyokagan@gmail.com> In-Reply-To: <1435861000-25278-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. Cc: Paolo Bonzini Signed-off-by: Paul Tan --- t/t4150-am.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/t/t4150-am.sh b/t/t4150-am.sh index b822a39..3f54bdf 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -563,6 +563,17 @@ 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 checkout -f 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.81.gfe77482