t4014: drop unnecessary blank lines from test cases

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index ca7debf1d4c0b5f73301b2f8a35490b77c167a61..3ed3feabfec1aad6547713f0f5928f0462b280b2 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -9,7 +9,6 @@ test_description='various format-patch tests'
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
 test_expect_success setup '
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
 test_expect_success setup '

-

        for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
        cat file >elif &&
        git add file elif &&
        for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
        cat file >elif &&
        git add file elif &&


@@ -60,20 +59,16 @@ test_expect_success setup '
 '
 
 test_expect_success "format-patch --ignore-if-in-upstream" '
 '
 
 test_expect_success "format-patch --ignore-if-in-upstream" '

-

        git format-patch --stdout master..side >patch0 &&
        cnt=$(grep "^From " patch0 | wc -l) &&
        test $cnt = 3
        git format-patch --stdout master..side >patch0 &&
        cnt=$(grep "^From " patch0 | wc -l) &&
        test $cnt = 3

-

 '
 
 test_expect_success "format-patch --ignore-if-in-upstream" '
 '
 
 test_expect_success "format-patch --ignore-if-in-upstream" '

-

        git format-patch --stdout \
                --ignore-if-in-upstream master..side >patch1 &&
        cnt=$(grep "^From " patch1 | wc -l) &&
        test $cnt = 2
        git format-patch --stdout \
                --ignore-if-in-upstream master..side >patch1 &&
        cnt=$(grep "^From " patch1 | wc -l) &&
        test $cnt = 2

-

 '
 
 test_expect_success "format-patch --ignore-if-in-upstream handles tags" '
 '
 
 test_expect_success "format-patch --ignore-if-in-upstream handles tags" '


@@ -85,7 +80,6 @@ test_expect_success "format-patch --ignore-if-in-upstream handles tags" '
 '
 
 test_expect_success "format-patch doesn't consider merge commits" '
 '
 
 test_expect_success "format-patch doesn't consider merge commits" '

-

        git checkout -b slave master &&
        echo "Another line" >>file &&
        test_tick &&
        git checkout -b slave master &&
        echo "Another line" >>file &&
        test_tick &&


@@ -101,7 +95,6 @@ test_expect_success "format-patch doesn't consider merge commits" '
 '
 
 test_expect_success "format-patch result applies" '
 '
 
 test_expect_success "format-patch result applies" '

-

        git checkout -b rebuild-0 master &&
        git am -3 patch0 &&
        cnt=$(git rev-list master.. | wc -l) &&
        git checkout -b rebuild-0 master &&
        git am -3 patch0 &&
        cnt=$(git rev-list master.. | wc -l) &&


@@ -109,7 +102,6 @@ test_expect_success "format-patch result applies" '
 '
 
 test_expect_success "format-patch --ignore-if-in-upstream result applies" '
 '
 
 test_expect_success "format-patch --ignore-if-in-upstream result applies" '

-

        git checkout -b rebuild-1 master &&
        git am -3 patch1 &&
        cnt=$(git rev-list master.. | wc -l) &&
        git checkout -b rebuild-1 master &&
        git am -3 patch1 &&
        cnt=$(git rev-list master.. | wc -l) &&


@@ -117,26 +109,19 @@ test_expect_success "format-patch --ignore-if-in-upstream result applies" '
 '
 
 test_expect_success 'commit did not screw up the log message' '
 '
 
 test_expect_success 'commit did not screw up the log message' '

-

        git cat-file commit side | grep "^Side .* with .* backslash-n"
        git cat-file commit side | grep "^Side .* with .* backslash-n"

-

 '
 
 test_expect_success 'format-patch did not screw up the log message' '
 '
 
 test_expect_success 'format-patch did not screw up the log message' '

-

        grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
        grep "^Subject: .*Side changes #3 with .* backslash-n" patch1
        grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
        grep "^Subject: .*Side changes #3 with .* backslash-n" patch1

-

 '
 
 test_expect_success 'replay did not screw up the log message' '
 '
 
 test_expect_success 'replay did not screw up the log message' '

-

        git cat-file commit rebuild-1 | grep "^Side .* with .* backslash-n"
        git cat-file commit rebuild-1 | grep "^Side .* with .* backslash-n"

-

 '
 
 test_expect_success 'extra headers' '
 '
 
 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 config format.headers "To: R E Cipient <rcipient@example.com>
 " &&
        git config --add format.headers "Cc: S E Cipient <scipient@example.com>


@@ -145,22 +130,18 @@ test_expect_success 'extra headers' '
        sed -e "/^\$/q" patch2 > hdrs2 &&
        grep "^To: R E Cipient <rcipient@example.com>\$" hdrs2 &&
        grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs2
        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' '
 '
 
 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
        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' '
 '
 
 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 &&
        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 &&


@@ -170,7 +151,6 @@ test_expect_success 'extra headers with multiple To:s' '
 '
 
 test_expect_success 'additional command line cc (ascii)' '
 '
 
 test_expect_success 'additional command line cc (ascii)' '

-

        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 &&
        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 &&


@@ -178,7 +158,6 @@ test_expect_success 'additional command line cc (ascii)' '
 '
 
 test_expect_failure 'additional command line cc (rfc822)' '
 '
 
 test_expect_failure 'additional command line cc (rfc822)' '

-

        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 &&
        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 &&


@@ -186,14 +165,12 @@ test_expect_failure 'additional command line cc (rfc822)' '
 '
 
 test_expect_success 'command line headers' '
 '
 
 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 --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 &&
        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 &&


@@ -201,40 +178,34 @@ test_expect_success 'configuration headers and command line headers' '
 '
 
 test_expect_success 'command line To: header (ascii)' '
 '
 
 test_expect_success 'command line To: header (ascii)' '

-

        git config --unset-all format.headers &&
        git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
        grep "^To: R E Cipient <rcipient@example.com>\$" patch8
 '
 
 test_expect_failure 'command line To: header (rfc822)' '
        git config --unset-all format.headers &&
        git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
        grep "^To: R E Cipient <rcipient@example.com>\$" patch8
 '
 
 test_expect_failure 'command line To: header (rfc822)' '

-

        git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
        grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch8
 '
 
 test_expect_failure 'command line To: header (rfc2047)' '
        git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
        grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch8
 '
 
 test_expect_failure 'command line To: header (rfc2047)' '

-

        git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
        grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch8
 '
 
 test_expect_success 'configuration To: header (ascii)' '
        git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 &&
        grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch8
 '
 
 test_expect_success 'configuration To: header (ascii)' '

-

        git config format.to "R E Cipient <rcipient@example.com>" &&
        git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
        grep "^To: R E Cipient <rcipient@example.com>\$" patch9
 '
 
 test_expect_failure 'configuration To: header (rfc822)' '
        git config format.to "R E Cipient <rcipient@example.com>" &&
        git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
        grep "^To: R E Cipient <rcipient@example.com>\$" patch9
 '
 
 test_expect_failure 'configuration To: header (rfc822)' '

-

        git config format.to "R. E. Cipient <rcipient@example.com>" &&
        git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
        grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch9
 '
 
 test_expect_failure 'configuration To: header (rfc2047)' '
        git config format.to "R. E. Cipient <rcipient@example.com>" &&
        git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
        grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch9
 '
 
 test_expect_failure 'configuration To: header (rfc2047)' '

-

        git config format.to "R Ä Cipient <rcipient@example.com>" &&
        git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
        grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch9
        git config format.to "R Ä Cipient <rcipient@example.com>" &&
        git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 &&
        grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch9


@@ -249,7 +220,6 @@ check_patch () {
 }
 
 test_expect_success 'format.from=false' '
 }
 
 test_expect_success 'format.from=false' '

-

        git -c format.from=false format-patch --stdout master..side |
        sed -e "/^\$/q" >patch &&
        check_patch patch &&
        git -c format.from=false format-patch --stdout master..side |
        sed -e "/^\$/q" >patch &&
        check_patch patch &&


@@ -257,7 +227,6 @@ test_expect_success 'format.from=false' '
 '
 
 test_expect_success 'format.from=true' '
 '
 
 test_expect_success 'format.from=true' '

-

        git -c format.from=true format-patch --stdout master..side |
        sed -e "/^\$/q" >patch &&
        check_patch patch &&
        git -c format.from=true format-patch --stdout master..side |
        sed -e "/^\$/q" >patch &&
        check_patch patch &&


@@ -265,7 +234,6 @@ test_expect_success 'format.from=true' '
 '
 
 test_expect_success 'format.from with address' '
 '
 
 test_expect_success 'format.from with address' '

-

        git -c format.from="F R Om <from@example.com>" format-patch --stdout master..side |
        sed -e "/^\$/q" >patch &&
        check_patch patch &&
        git -c format.from="F R Om <from@example.com>" format-patch --stdout master..side |
        sed -e "/^\$/q" >patch &&
        check_patch patch &&


@@ -273,7 +241,6 @@ test_expect_success 'format.from with address' '
 '
 
 test_expect_success '--no-from overrides format.from' '
 '
 
 test_expect_success '--no-from overrides format.from' '

-

        git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout master..side |
        sed -e "/^\$/q" >patch &&
        check_patch patch &&
        git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout master..side |
        sed -e "/^\$/q" >patch &&
        check_patch patch &&


@@ -281,7 +248,6 @@ test_expect_success '--no-from overrides format.from' '
 '
 
 test_expect_success '--from overrides format.from' '
 '
 
 test_expect_success '--from overrides format.from' '

-

        git -c format.from="F R Om <from@example.com>" format-patch --from --stdout master..side |
        sed -e "/^\$/q" >patch &&
        check_patch patch &&
        git -c format.from="F R Om <from@example.com>" format-patch --from --stdout master..side |
        sed -e "/^\$/q" >patch &&
        check_patch patch &&


@@ -289,7 +255,6 @@ test_expect_success '--from overrides format.from' '
 '
 
 test_expect_success '--no-to overrides config.to' '
 '
 
 test_expect_success '--no-to overrides config.to' '

-

        git config --replace-all format.to \
                "R E Cipient <rcipient@example.com>" &&
        git format-patch --no-to --stdout master..side |
        git config --replace-all format.to \
                "R E Cipient <rcipient@example.com>" &&
        git format-patch --no-to --stdout master..side |


@@ -299,7 +264,6 @@ test_expect_success '--no-to overrides config.to' '
 '
 
 test_expect_success '--no-to and --to replaces config.to' '
 '
 
 test_expect_success '--no-to and --to replaces config.to' '

-

        git config --replace-all format.to \
                "Someone <someone@out.there>" &&
        git format-patch --no-to --to="Someone Else <else@out.there>" \
        git config --replace-all format.to \
                "Someone <someone@out.there>" &&
        git format-patch --no-to --to="Someone Else <else@out.there>" \


@@ -311,7 +275,6 @@ test_expect_success '--no-to and --to replaces config.to' '
 '
 
 test_expect_success '--no-cc overrides config.cc' '
 '
 
 test_expect_success '--no-cc overrides config.cc' '

-

        git config --replace-all format.cc \
                "C E Cipient <rcipient@example.com>" &&
        git format-patch --no-cc --stdout master..side |
        git config --replace-all format.cc \
                "C E Cipient <rcipient@example.com>" &&
        git format-patch --no-cc --stdout master..side |


@@ -321,7 +284,6 @@ test_expect_success '--no-cc overrides config.cc' '
 '
 
 test_expect_success '--no-add-header overrides config.headers' '
 '
 
 test_expect_success '--no-add-header overrides config.headers' '

-

        git config --replace-all format.headers \
                "Header1: B E Cipient <rcipient@example.com>" &&
        git format-patch --no-add-header --stdout master..side |
        git config --replace-all format.headers \
                "Header1: B E Cipient <rcipient@example.com>" &&
        git format-patch --no-add-header --stdout master..side |


@@ -331,7 +293,6 @@ test_expect_success '--no-add-header overrides config.headers' '
 '
 
 test_expect_success 'multiple files' '
 '
 
 test_expect_success 'multiple files' '

-

        rm -rf patches/ &&
        git checkout side &&
        git format-patch -o patches/ master &&
        rm -rf patches/ &&
        git checkout side &&
        git format-patch -o patches/ master &&


@@ -594,7 +555,6 @@ test_expect_success 'thread config + --no-thread' '
 '
 
 test_expect_success 'excessive subject' '
 '
 
 test_expect_success 'excessive subject' '

-

        rm -rf patches/ &&
        git checkout side &&
        before=$(git hash-object file) &&
        rm -rf patches/ &&
        git checkout side &&
        before=$(git hash-object file) &&


@@ -622,7 +582,6 @@ test_expect_success 'cover-letter inherits diff options' '
        ! grep "file => foo .* 0 *\$" 0000-cover-letter.patch &&
        git format-patch --cover-letter -1 -M &&
        grep "file => foo .* 0 *\$" 0000-cover-letter.patch
        ! 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
 '
 
 cat > expect << EOF


@@ -636,11 +595,9 @@ cat > expect << EOF
 EOF
 
 test_expect_success 'shortlog of cover-letter wraps overly-long onelines' '
 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 &&
        test_cmp expect output
        git format-patch --cover-letter -2 &&
        sed -e "1,/A U Thor/d" -e "/^\$/q" < 0000-cover-letter.patch > output &&
        test_cmp expect output

-

 '
 
 cat > expect << EOF
 '
 
 cat > expect << EOF


@@ -656,13 +613,11 @@ index $before..$after 100644
 EOF
 
 test_expect_success 'format-patch respects -U' '
 EOF
 
 test_expect_success 'format-patch respects -U' '

-

        git format-patch -U4 -2 &&
        sed -e "1,/^diff/d" -e "/^+5/q" \
                <0001-This-is-an-excessively-long-subject-line-for-a-messa.patch \
                >output &&
        test_cmp expect output
        git format-patch -U4 -2 &&
        sed -e "1,/^diff/d" -e "/^+5/q" \
                <0001-This-is-an-excessively-long-subject-line-for-a-messa.patch \
                >output &&
        test_cmp expect output

-

 '
 
 cat > expect << EOF
 '
 
 cat > expect << EOF


@@ -679,11 +634,9 @@ index $before..$after 100644
 EOF
 
 test_expect_success 'format-patch -p suppresses stat' '
 EOF
 
 test_expect_success 'format-patch -p suppresses stat' '

-

        git format-patch -p -2 &&
        sed -e "1,/^\$/d" -e "/^+5/q" < 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch > output &&
        test_cmp expect output
        git format-patch -p -2 &&
        sed -e "1,/^\$/d" -e "/^+5/q" < 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch > output &&
        test_cmp expect output

-

 '
 
 test_expect_success 'format-patch from a subdirectory (1)' '
 '
 
 test_expect_success 'format-patch from a subdirectory (1)' '