Merge branch 'jn/gitweb-cleanup'

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 8b970c39a2713e6413510fe84f2124b76b12c9db..922a8941ed4720e2ad6dcd500a3759187aace969 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -16,9 +16,7 @@ test_expect_success setup '
        git checkout -b side &&
 
        for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
-       chmod +x elif &&
-       git update-index file elif &&
-       git update-index --chmod=+x elif &&
+       test_chmod +x elif &&
        git commit -m "Side changes #1" &&
 
        for i in D E F; do echo "$i"; done >>file &&
@@ -130,6 +128,21 @@ test_expect_success 'additional command line cc' '
        grep "^ *S. E. Cipient <scipient@example.com>$" patch5
 '
 
+test_expect_success 'command line headers' '
+
+       git config --unset-all format.headers &&
+       git format-patch --add-header="Cc: R. E. Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^$/q" >patch6 &&
+       grep "^Cc: R. E. Cipient <rcipient@example.com>$" patch6
+'
+
+test_expect_success 'configuration headers and command line headers' '
+
+       git config --replace-all format.headers "Cc: R. E. Cipient <rcipient@example.com>" &&
+       git format-patch --add-header="Cc: S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^$/q" >patch7 &&
+       grep "^Cc: R. E. Cipient <rcipient@example.com>,$" patch7 &&
+       grep "^ *S. E. Cipient <scipient@example.com>$" patch7
+'
+
 test_expect_success 'multiple files' '
 
        rm -rf patches/ &&
@@ -257,6 +270,126 @@ test_expect_success 'thread cover-letter in-reply-to' '
                --in-reply-to="<test.message>" --thread master
 '
 
+test_expect_success 'thread explicit shallow' '
+       check_threading expect.cl-irt --cover-letter \
+               --in-reply-to="<test.message>" --thread=shallow master
+'
+
+cat > expect.deep <<EOF
+---
+Message-Id: <0>
+---
+Message-Id: <1>
+In-Reply-To: <0>
+References: <0>
+---
+Message-Id: <2>
+In-Reply-To: <1>
+References: <0>
+       <1>
+EOF
+
+test_expect_success 'thread deep' '
+       check_threading expect.deep --thread=deep master
+'
+
+cat > expect.deep-irt <<EOF
+---
+Message-Id: <0>
+In-Reply-To: <1>
+References: <1>
+---
+Message-Id: <2>
+In-Reply-To: <0>
+References: <1>
+       <0>
+---
+Message-Id: <3>
+In-Reply-To: <2>
+References: <1>
+       <0>
+       <2>
+EOF
+
+test_expect_success 'thread deep in-reply-to' '
+       check_threading expect.deep-irt  --thread=deep \
+               --in-reply-to="<test.message>" master
+'
+
+cat > expect.deep-cl <<EOF
+---
+Message-Id: <0>
+---
+Message-Id: <1>
+In-Reply-To: <0>
+References: <0>
+---
+Message-Id: <2>
+In-Reply-To: <1>
+References: <0>
+       <1>
+---
+Message-Id: <3>
+In-Reply-To: <2>
+References: <0>
+       <1>
+       <2>
+EOF
+
+test_expect_success 'thread deep cover-letter' '
+       check_threading expect.deep-cl --cover-letter --thread=deep master
+'
+
+cat > expect.deep-cl-irt <<EOF
+---
+Message-Id: <0>
+In-Reply-To: <1>
+References: <1>
+---
+Message-Id: <2>
+In-Reply-To: <0>
+References: <1>
+       <0>
+---
+Message-Id: <3>
+In-Reply-To: <2>
+References: <1>
+       <0>
+       <2>
+---
+Message-Id: <4>
+In-Reply-To: <3>
+References: <1>
+       <0>
+       <2>
+       <3>
+EOF
+
+test_expect_success 'thread deep cover-letter in-reply-to' '
+       check_threading expect.deep-cl-irt --cover-letter \
+               --in-reply-to="<test.message>" --thread=deep master
+'
+
+test_expect_success 'thread via config' '
+       git config format.thread true &&
+       check_threading expect.thread master
+'
+
+test_expect_success 'thread deep via config' '
+       git config format.thread deep &&
+       check_threading expect.deep master
+'
+
+test_expect_success 'thread config + override' '
+       git config format.thread deep &&
+       check_threading expect.thread --thread master
+'
+
+test_expect_success 'thread config + --no-thread' '
+       git config format.thread deep &&
+       check_threading expect.no-threading --no-thread master
+'
+
 test_expect_success 'excessive subject' '
 
        rm -rf patches/ &&
@@ -372,4 +505,15 @@ test_expect_success 'format-patch from a subdirectory (3)' '
        test -f "$basename"
 '
 
+test_expect_success 'format-patch --in-reply-to' '
+       git format-patch -1 --stdout --in-reply-to "baz@foo.bar" > patch8 &&
+       grep "^In-Reply-To: <baz@foo.bar>" patch8 &&
+       grep "^References: <baz@foo.bar>" patch8
+'
+
+test_expect_success 'format-patch --signoff' '
+       git format-patch -1 --signoff --stdout |
+       grep "^Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
+'
+
 test_done