Merge branch 'lt/dirmatch-optim'

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index ac78752067ef69844fc9b171a02d151a81b56958..b2b7a8db859fe7f5d8c74fb27b77e4eba583ebc4 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -88,6 +88,48 @@ test_expect_success 'replay did not screw up the log message' '
 
 '
 
+test_expect_success 'extra headers' '
+
+       git config format.headers "To: R. E. Cipient <rcipient@example.com>
+" &&
+       git config --add format.headers "Cc: S. E. Cipient <scipient@example.com>
+" &&
+       git format-patch --stdout master..side > patch2 &&
+       sed -e "/^$/q" patch2 > hdrs2 &&
+       grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs2 &&
+       grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs2
+       
+'
+
+test_expect_success 'extra headers without newlines' '
+
+       git config --replace-all format.headers "To: R. E. Cipient <rcipient@example.com>" &&
+       git config --add format.headers "Cc: S. E. Cipient <scipient@example.com>" &&
+       git format-patch --stdout master..side >patch3 &&
+       sed -e "/^$/q" patch3 > hdrs3 &&
+       grep "^To: R. E. Cipient <rcipient@example.com>$" hdrs3 &&
+       grep "^Cc: S. E. Cipient <scipient@example.com>$" hdrs3
+       
+'
+
+test_expect_success 'extra headers with multiple To:s' '
+
+       git config --replace-all format.headers "To: R. E. Cipient <rcipient@example.com>" &&
+       git config --add format.headers "To: S. E. Cipient <scipient@example.com>" &&
+       git format-patch --stdout master..side > patch4 &&
+       sed -e "/^$/q" patch4 > hdrs4 &&
+       grep "^To: R. E. Cipient <rcipient@example.com>,$" hdrs4 &&
+       grep "^ *S. E. Cipient <scipient@example.com>$" hdrs4
+'
+
+test_expect_success 'additional command line cc' '
+
+       git config --replace-all format.headers "Cc: R. E. Cipient <rcipient@example.com>" &&
+       git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^$/q" >patch5 &&
+       grep "^Cc: R. E. Cipient <rcipient@example.com>,$" patch5 &&
+       grep "^ *S. E. Cipient <scipient@example.com>$" patch5
+'
+
 test_expect_success 'multiple files' '
 
        rm -rf patches/ &&
@@ -105,7 +147,7 @@ test_expect_success 'thread' '
        for i in patches/0002-* patches/0003-*
        do
          grep "References: $FIRST_MID" $i &&
-         grep "In-Reply-To: $FIRST_MID" $i
+         grep "In-Reply-To: $FIRST_MID" $i || break
        done
 '
 
@@ -118,7 +160,7 @@ test_expect_success 'thread in-reply-to' '
        for i in patches/*
        do
          grep "References: $FIRST_MID" $i &&
-         grep "In-Reply-To: $FIRST_MID" $i
+         grep "In-Reply-To: $FIRST_MID" $i || break
        done
 '
 
@@ -131,7 +173,7 @@ test_expect_success 'thread cover-letter' '
        for i in patches/0001-* patches/0002-* patches/0003-* 
        do
          grep "References: $FIRST_MID" $i &&
-         grep "In-Reply-To: $FIRST_MID" $i
+         grep "In-Reply-To: $FIRST_MID" $i || break
        done
 '
 
@@ -144,7 +186,7 @@ test_expect_success 'thread cover-letter in-reply-to' '
        for i in patches/*
        do
          grep "References: $FIRST_MID" $i &&
-         grep "In-Reply-To: $FIRST_MID" $i
+         grep "In-Reply-To: $FIRST_MID" $i || break
        done
 '
 
@@ -159,4 +201,33 @@ test_expect_success 'excessive subject' '
        ls patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
 '
 
+test_expect_success 'cover-letter inherits diff options' '
+
+       git mv file foo &&
+       git commit -m foo &&
+       git format-patch --cover-letter -1 &&
+       ! grep "file => foo .* 0 *$" 0000-cover-letter.patch &&
+       git format-patch --cover-letter -1 -M &&
+       grep "file => foo .* 0 *$" 0000-cover-letter.patch
+
+'
+
+cat > expect << EOF
+  This is an excessively long subject line for a message due to the
+    habit some projects have of not having a short, one-line subject at
+    the start of the commit message, but rather sticking a whole
+    paragraph right at the start as the only thing in the commit
+    message. It had better not become the filename for the patch.
+  foo
+
+EOF
+
+test_expect_success 'shortlog of cover-letter wraps overly-long onelines' '
+
+       git format-patch --cover-letter -2 &&
+       sed -e "1,/A U Thor/d" -e "/^$/q" < 0000-cover-letter.patch > output &&
+       git diff expect output
+
+'
+
 test_done