X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=t%2Ft5100-mailinfo.sh;fp=t%2Ft5100-mailinfo.sh;h=9690dcad4fd5ba0148b3f6a709ab321976545db0;hb=56585a2caf12934382aee9f625e14dca0ba95ab9;hp=d19cd8c2aa43a74d5650d8bb1bf355576f04ea34;hpb=ae52d57f0b45b2db93f13c009b7a31108d5d6525;p=thirdparty%2Fgit.git

diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index d19cd8c2aa..9690dcad4f 100755
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -13,7 +13,7 @@ test_expect_success 'split sample box' \
 	'git mailsplit -o. "$DATA/sample.mbox" >last &&
 	last=$(cat last) &&
 	echo total is $last &&
-	test $(cat last) = 17'
+	test $(cat last) = 18'
 
 check_mailinfo () {
 	mail=$1 opt=$2
@@ -158,6 +158,19 @@ test_expect_success 'mailinfo handles rfc2822 comment' '
 	test_cmp "$DATA/comment.expect" comment/info
 '
 
+test_expect_success 'mailinfo with mailinfo.scissors config' '
+	test_config mailinfo.scissors true &&
+	(
+		mkdir sub &&
+		cd sub &&
+		git mailinfo ../msg0014.sc ../patch0014.sc <../0014 >../info0014.sc
+	) &&
+	test_cmp "$DATA/msg0014--scissors" msg0014.sc &&
+	test_cmp "$DATA/patch0014--scissors" patch0014.sc &&
+	test_cmp "$DATA/info0014--scissors" info0014.sc
+'
+
+
 test_expect_success 'mailinfo no options' '
 	subj="$(echo "Subject: [PATCH] [other] [PATCH] message" |
 		git mailinfo /dev/null /dev/null)" &&