t4014: remove spaces after redirect operators

For shell scripts, the usual convention is for there to be no space
after redirection operators, (e.g. `>file`, not `> file`). Remove these
spaces wherever they appear.

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 a7b440b0030d61e15a04b798af6fafd9385c3186..075affb1e5ca31b003228d634756678601180cd5 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -126,8 +126,8 @@ test_expect_success 'extra headers' '
 " &&
        git config --add format.headers "Cc: S E Cipient <scipient@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 &&
+       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
 '
        grep "^To: R E Cipient <rcipient@example.com>\$" hdrs2 &&
        grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs2
 '


@@ -136,7 +136,7 @@ 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 &&
        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 &&
+       sed -e "/^\$/q" patch3 >hdrs3 &&

        grep "^To: R E Cipient <rcipient@example.com>\$" hdrs3 &&
        grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs3
 '
        grep "^To: R E Cipient <rcipient@example.com>\$" hdrs3 &&
        grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs3
 '


@@ -144,8 +144,8 @@ test_expect_success 'extra headers without newlines' '
 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>" &&
 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 &&
+       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
 '
        grep "^To: R E Cipient <rcipient@example.com>,\$" hdrs4 &&
        grep "^ *S E Cipient <scipient@example.com>\$" hdrs4
 '


@@ -318,7 +318,7 @@ test_expect_success 'reroll count (-v)' '
 check_threading () {
        expect="$1" &&
        shift &&
 check_threading () {
        expect="$1" &&
        shift &&

-       (git format-patch --stdout "$@"; echo $? > status.out) |
+       (git format-patch --stdout "$@"; echo $? >status.out) |

        # Prints everything between the Message-ID and In-Reply-To,
        # and replaces all Message-ID-lookalikes by a sequence number
        perl -ne '
        # Prints everything between the Message-ID and In-Reply-To,
        # and replaces all Message-ID-lookalikes by a sequence number
        perl -ne '


@@ -333,12 +333,12 @@ check_threading () {
                        print;
                }
                print "---\n" if /^From /i;
                        print;
                }
                print "---\n" if /^From /i;

-       ' > actual &&
+       ' >actual &&

        test 0 = "$(cat status.out)" &&
        test_cmp "$expect" actual
 }
 
        test 0 = "$(cat status.out)" &&
        test_cmp "$expect" actual
 }
 

-cat >> expect.no-threading <<EOF
+cat >>expect.no-threading <<EOF

 ---
 ---
 ---
 ---
 ---
 ---


@@ -349,7 +349,7 @@ test_expect_success 'no threading' '
        check_threading expect.no-threading master
 '
 
        check_threading expect.no-threading master
 '
 

-cat > expect.thread <<EOF
+cat >expect.thread <<EOF

 ---
 Message-Id: <0>
 ---
 ---
 Message-Id: <0>
 ---


@@ -366,7 +366,7 @@ test_expect_success 'thread' '
        check_threading expect.thread --thread master
 '
 
        check_threading expect.thread --thread master
 '
 

-cat > expect.in-reply-to <<EOF
+cat >expect.in-reply-to <<EOF

 ---
 Message-Id: <0>
 In-Reply-To: <1>
 ---
 Message-Id: <0>
 In-Reply-To: <1>


@@ -386,7 +386,7 @@ test_expect_success 'thread in-reply-to' '
                --thread master
 '
 
                --thread master
 '
 

-cat > expect.cover-letter <<EOF
+cat >expect.cover-letter <<EOF

 ---
 Message-Id: <0>
 ---
 ---
 Message-Id: <0>
 ---


@@ -407,7 +407,7 @@ test_expect_success 'thread cover-letter' '
        check_threading expect.cover-letter --cover-letter --thread master
 '
 
        check_threading expect.cover-letter --cover-letter --thread master
 '
 

-cat > expect.cl-irt <<EOF
+cat >expect.cl-irt <<EOF

 ---
 Message-Id: <0>
 In-Reply-To: <1>
 ---
 Message-Id: <0>
 In-Reply-To: <1>


@@ -439,7 +439,7 @@ test_expect_success 'thread explicit shallow' '
                --in-reply-to="<test.message>" --thread=shallow master
 '
 
                --in-reply-to="<test.message>" --thread=shallow master
 '
 

-cat > expect.deep <<EOF
+cat >expect.deep <<EOF

 ---
 Message-Id: <0>
 ---
 ---
 Message-Id: <0>
 ---


@@ -457,7 +457,7 @@ test_expect_success 'thread deep' '
        check_threading expect.deep --thread=deep master
 '
 
        check_threading expect.deep --thread=deep master
 '
 

-cat > expect.deep-irt <<EOF
+cat >expect.deep-irt <<EOF

 ---
 Message-Id: <0>
 In-Reply-To: <1>
 ---
 Message-Id: <0>
 In-Reply-To: <1>


@@ -480,7 +480,7 @@ test_expect_success 'thread deep in-reply-to' '
                --in-reply-to="<test.message>" master
 '
 
                --in-reply-to="<test.message>" master
 '
 

-cat > expect.deep-cl <<EOF
+cat >expect.deep-cl <<EOF

 ---
 Message-Id: <0>
 ---
 ---
 Message-Id: <0>
 ---


@@ -504,7 +504,7 @@ test_expect_success 'thread deep cover-letter' '
        check_threading expect.deep-cl --cover-letter --thread=deep master
 '
 
        check_threading expect.deep-cl --cover-letter --thread=deep master
 '
 

-cat > expect.deep-cl-irt <<EOF
+cat >expect.deep-cl-irt <<EOF

 ---
 Message-Id: <0>
 In-Reply-To: <1>
 ---
 Message-Id: <0>
 In-Reply-To: <1>


@@ -584,7 +584,7 @@ test_expect_success 'cover-letter inherits diff options' '
        grep "file => foo .* 0 *\$" 0000-cover-letter.patch
 '
 
        grep "file => foo .* 0 *\$" 0000-cover-letter.patch
 '
 

-cat > expect << EOF
+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
   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


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

        test_cmp expect output
 '
 
        test_cmp expect output
 '
 

-cat > expect << EOF
+cat >expect <<EOF

 index $before..$after 100644
 --- a/file
 +++ b/file
 index $before..$after 100644
 --- a/file
 +++ b/file


@@ -620,7 +620,7 @@ test_expect_success 'format-patch respects -U' '
        test_cmp expect output
 '
 
        test_cmp expect output
 '
 

-cat > expect << EOF
+cat >expect <<EOF

 
 diff --git a/file b/file
 index $before..$after 100644
 
 diff --git a/file b/file
 index $before..$after 100644


@@ -635,7 +635,7 @@ EOF
 
 test_expect_success 'format-patch -p suppresses stat' '
        git format-patch -p -2 &&
 
 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 &&
+       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_cmp expect output
 '
 


@@ -689,7 +689,7 @@ test_expect_success 'format-patch from a subdirectory (3)' '
 '
 
 test_expect_success 'format-patch --in-reply-to' '
 '
 
 test_expect_success 'format-patch --in-reply-to' '

-       git format-patch -1 --stdout --in-reply-to "baz@foo.bar" > patch8 &&
+       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
 '
        grep "^In-Reply-To: <baz@foo.bar>" patch8 &&
        grep "^References: <baz@foo.bar>" patch8
 '


@@ -780,21 +780,21 @@ test_expect_success 'format-patch with multiple notes refs' '
        ! grep "this is note 2" out
 '
 
        ! grep "this is note 2" out
 '
 

-echo "fatal: --name-only does not make sense" > expect.name-only
-echo "fatal: --name-status does not make sense" > expect.name-status
-echo "fatal: --check does not make sense" > expect.check
+echo "fatal: --name-only does not make sense" >expect.name-only
+echo "fatal: --name-status does not make sense" >expect.name-status
+echo "fatal: --check does not make sense" >expect.check

 
 test_expect_success 'options no longer allowed for format-patch' '
 
 test_expect_success 'options no longer allowed for format-patch' '

-       test_must_fail git format-patch --name-only 2> output &&
+       test_must_fail git format-patch --name-only 2>output &&

        test_i18ncmp expect.name-only output &&
        test_i18ncmp expect.name-only output &&

-       test_must_fail git format-patch --name-status 2> output &&
+       test_must_fail git format-patch --name-status 2>output &&

        test_i18ncmp expect.name-status output &&
        test_i18ncmp expect.name-status output &&

-       test_must_fail git format-patch --check 2> output &&
+       test_must_fail git format-patch --check 2>output &&

        test_i18ncmp expect.check output
 '
 
 test_expect_success 'format-patch --numstat should produce a patch' '
        test_i18ncmp expect.check output
 '
 
 test_expect_success 'format-patch --numstat should produce a patch' '

-       git format-patch --numstat --stdout master..side > output &&
+       git format-patch --numstat --stdout master..side >output &&

        test 5 = $(grep "^diff --git a/" output | wc -l)
 '
 
        test 5 = $(grep "^diff --git a/" output | wc -l)
 '
 


@@ -1610,14 +1610,14 @@ test_expect_success 'format-patch --base' '
        echo "base-commit: $(git rev-parse HEAD~3)" >>expect &&
        echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk "{print \$1}")" >>expect &&
        echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk "{print \$1}")" >>expect &&
        echo "base-commit: $(git rev-parse HEAD~3)" >>expect &&
        echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk "{print \$1}")" >>expect &&
        echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk "{print \$1}")" >>expect &&

-       signature >> expect &&
+       signature >>expect &&

        test_cmp expect actual1 &&
        test_cmp expect actual2 &&
        echo >fail &&
        echo "base-commit: $(git rev-parse HEAD~3)" >>fail &&
        echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --unstable | awk "{print \$1}")" >>fail &&
        echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --unstable | awk "{print \$1}")" >>fail &&
        test_cmp expect actual1 &&
        test_cmp expect actual2 &&
        echo >fail &&
        echo "base-commit: $(git rev-parse HEAD~3)" >>fail &&
        echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --unstable | awk "{print \$1}")" >>fail &&
        echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --unstable | awk "{print \$1}")" >>fail &&

-       signature >> fail &&
+       signature >>fail &&

        ! test_cmp fail actual1 &&
        ! test_cmp fail actual2
 '
        ! test_cmp fail actual1 &&
        ! test_cmp fail actual2
 '