t4015: modernise style

Move the preparatory steps that create the expected output inside
the test bodies, remove unnecessary blank lines before and after the
test bodies, and drop SP between redirection operator and its target.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 604a838c1ab4d173f9910158935d74398fabf788..0bfc7ffac8ba123bd210792b34bbba4babfcdc8e 100755 (executable)
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -9,138 +9,144 @@ test_description='Test special whitespace in diff engine.
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh
 
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/diff-lib.sh
 

-# Ray Lehtiniemi's example
+test_expect_success "Ray Lehtiniemi's example" '
+       cat <<-\EOF >x &&
+       do {
+          nothing;
+       } while (0);
+       EOF
+       git update-index --add x &&

 
 

-cat << EOF > x
-do {
-   nothing;
-} while (0);
-EOF
+       cat <<-\EOF >x &&
+       do
+       {
+          nothing;
+       }
+       while (0);
+       EOF

 
 

-git update-index --add x
+       cat <<-\EOF >expect &&
+       diff --git a/x b/x
+       index adf3937..6edc172 100644
+       --- a/x
+       +++ b/x
+       @@ -1,3 +1,5 @@
+       -do {
+       +do
+       +{
+           nothing;
+       -} while (0);
+       +}
+       +while (0);
+       EOF

 
 

-cat << EOF > x
-do
-{
-   nothing;
-}
-while (0);
-EOF
+       git diff >out &&
+       test_cmp expect out &&

 
 

-cat << EOF > expect
-diff --git a/x b/x
-index adf3937..6edc172 100644
---- a/x
-+++ b/x
-@@ -1,3 +1,5 @@
--do {
-+do
-+{
-    nothing;
--} while (0);
-+}
-+while (0);
-EOF
+       git diff -w >out &&
+       test_cmp expect out &&

 
 

-git diff > out
-test_expect_success "Ray's example without options" 'test_cmp expect out'
+       git diff -b >out &&
+       test_cmp expect out
+'

 
 

-git diff -w > out
-test_expect_success "Ray's example with -w" 'test_cmp expect out'
+test_expect_success 'another test, without options' '
+       tr Q "\015" <<-\EOF >x &&
+       whitespace at beginning
+       whitespace change
+       whitespace in the middle
+       whitespace at end
+       unchanged line
+       CR at endQ
+       EOF

 
 

-git diff -b > out
-test_expect_success "Ray's example with -b" 'test_cmp expect out'
+       git update-index x &&

 
 

-tr 'Q' '\015' << EOF > x
-whitespace at beginning
-whitespace change
-whitespace in the middle
-whitespace at end
-unchanged line
-CR at endQ
-EOF
+       tr "_" " " <<-\EOF >x &&
+       _       whitespace at beginning
+       whitespace       change
+       white space in the middle
+       whitespace at end__
+       unchanged line
+       CR at end
+       EOF

 
 

-git update-index x
+       tr "Q_" "\015 " <<-\EOF >expect &&
+       diff --git a/x b/x
+       index d99af23..22d9f73 100644
+       --- a/x
+       +++ b/x
+       @@ -1,6 +1,6 @@
+       -whitespace at beginning
+       -whitespace change
+       -whitespace in the middle
+       -whitespace at end
+       +       whitespace at beginning
+       +whitespace      change
+       +white space in the middle
+       +whitespace at end__
+        unchanged line
+       -CR at endQ
+       +CR at end
+       EOF

 
 

-tr '_' ' ' << EOF > x
-       whitespace at beginning
-whitespace      change
-white space in the middle
-whitespace at end__
-unchanged line
-CR at end
-EOF
+       git diff >out &&
+       test_cmp expect out &&

 
 

-tr 'Q_' '\015 ' << EOF > expect
-diff --git a/x b/x
-index d99af23..8b32fb5 100644
---- a/x
-+++ b/x
-@@ -1,6 +1,6 @@
--whitespace at beginning
--whitespace change
--whitespace in the middle
--whitespace at end
-+      whitespace at beginning
-+whitespace     change
-+white space in the middle
-+whitespace at end__
- unchanged line
--CR at endQ
-+CR at end
-EOF
-git diff > out
-test_expect_success 'another test, without options' 'test_cmp expect out'
+       >expect &&
+       git diff -w >out &&
+       test_cmp expect out &&
+
+       git diff -w -b >out &&
+       test_cmp expect out &&
+
+       git diff -w --ignore-space-at-eol >out &&
+       test_cmp expect out &&
+
+       git diff -w -b --ignore-space-at-eol >out &&
+       test_cmp expect out &&

 
 

-cat << EOF > expect
-EOF
-git diff -w > out
-test_expect_success 'another test, with -w' 'test_cmp expect out'
-git diff -w -b > out
-test_expect_success 'another test, with -w -b' 'test_cmp expect out'
-git diff -w --ignore-space-at-eol > out
-test_expect_success 'another test, with -w --ignore-space-at-eol' 'test_cmp expect out'
-git diff -w -b --ignore-space-at-eol > out
-test_expect_success 'another test, with -w -b --ignore-space-at-eol' 'test_cmp expect out'
-
-tr 'Q_' '\015 ' << EOF > expect
-diff --git a/x b/x
-index d99af23..8b32fb5 100644
---- a/x
-+++ b/x
-@@ -1,6 +1,6 @@
--whitespace at beginning
-+      whitespace at beginning
- whitespace     change
--whitespace in the middle
-+white space in the middle
- whitespace at end__
- unchanged line
- CR at end
-EOF
-git diff -b > out
-test_expect_success 'another test, with -b' 'test_cmp expect out'
-git diff -b --ignore-space-at-eol > out
-test_expect_success 'another test, with -b --ignore-space-at-eol' 'test_cmp expect out'
-
-tr 'Q_' '\015 ' << EOF > expect
-diff --git a/x b/x
-index d99af23..8b32fb5 100644
---- a/x
-+++ b/x
-@@ -1,6 +1,6 @@
--whitespace at beginning
--whitespace change
--whitespace in the middle
-+      whitespace at beginning
-+whitespace     change
-+white space in the middle
- whitespace at end__
- unchanged line
- CR at end
-EOF
-git diff --ignore-space-at-eol > out
-test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect out'
+
+       tr "Q_" "\015 " <<-\EOF >expect &&
+       diff --git a/x b/x
+       index d99af23..22d9f73 100644
+       --- a/x
+       +++ b/x
+       @@ -1,6 +1,6 @@
+       -whitespace at beginning
+       +_      whitespace at beginning
+        whitespace      change
+       -whitespace in the middle
+       +white space in the middle
+        whitespace at end__
+        unchanged line
+        CR at end
+       EOF
+       git diff -b >out &&
+       test_cmp expect out &&
+
+       git diff -b --ignore-space-at-eol >out &&
+       test_cmp expect out &&
+
+       tr "Q_" "\015 " <<-\EOF >expect &&
+       diff --git a/x b/x
+       index d99af23..22d9f73 100644
+       --- a/x
+       +++ b/x
+       @@ -1,6 +1,6 @@
+       -whitespace at beginning
+       -whitespace change
+       -whitespace in the middle
+       +_      whitespace at beginning
+       +whitespace      change
+       +white space in the middle
+        whitespace at end__
+        unchanged line
+        CR at end
+       EOF
+       git diff --ignore-space-at-eol >out &&
+       test_cmp expect out
+'

 
 test_expect_success 'ignore-blank-lines: only new lines' '
        test_seq 5 >x &&
 
 test_expect_success 'ignore-blank-lines: only new lines' '
        test_seq 5 >x &&


@@ -489,291 +495,219 @@ test_expect_success 'ignore-blank-lines: mix changes and blank lines' '
 '
 
 test_expect_success 'check mixed spaces and tabs in indent' '
 '
 
 test_expect_success 'check mixed spaces and tabs in indent' '

-

        # This is indented with SP HT SP.
        # This is indented with SP HT SP.

-       echo "   foo();" > x &&
+       echo "   foo();" >x &&

        git diff --check | grep "space before tab in indent"
        git diff --check | grep "space before tab in indent"

-

 '
 
 test_expect_success 'check mixed tabs and spaces in indent' '
 '
 
 test_expect_success 'check mixed tabs and spaces in indent' '

-

        # This is indented with HT SP HT.
        # This is indented with HT SP HT.

-       echo "          foo();" > x &&
+       echo "          foo();" >x &&

        git diff --check | grep "space before tab in indent"
        git diff --check | grep "space before tab in indent"

-

 '
 
 test_expect_success 'check with no whitespace errors' '
 '
 
 test_expect_success 'check with no whitespace errors' '

-

        git commit -m "snapshot" &&
        git commit -m "snapshot" &&

-       echo "foo();" > x &&
+       echo "foo();" >x &&

        git diff --check
        git diff --check

-

 '
 
 test_expect_success 'check with trailing whitespace' '
 '
 
 test_expect_success 'check with trailing whitespace' '

-
-       echo "foo(); " > x &&
+       echo "foo(); " >x &&

        test_must_fail git diff --check
        test_must_fail git diff --check

-

 '
 
 test_expect_success 'check with space before tab in indent' '
 '
 
 test_expect_success 'check with space before tab in indent' '

-

        # indent has space followed by hard tab
        # indent has space followed by hard tab

-       echo "  foo();" > x &&
+       echo "  foo();" >x &&

        test_must_fail git diff --check
        test_must_fail git diff --check

-

 '
 
 test_expect_success '--check and --exit-code are not exclusive' '
 '
 
 test_expect_success '--check and --exit-code are not exclusive' '

-

        git checkout x &&
        git diff --check --exit-code
        git checkout x &&
        git diff --check --exit-code

-

 '
 
 test_expect_success '--check and --quiet are not exclusive' '
 '
 
 test_expect_success '--check and --quiet are not exclusive' '

-

        git diff --check --quiet
        git diff --check --quiet

-

 '
 
 test_expect_success 'check staged with no whitespace errors' '
 '
 
 test_expect_success 'check staged with no whitespace errors' '

-
-       echo "foo();" > x &&
+       echo "foo();" >x &&

        git add x &&
        git diff --cached --check
        git add x &&
        git diff --cached --check

-

 '
 
 test_expect_success 'check staged with trailing whitespace' '
 '
 
 test_expect_success 'check staged with trailing whitespace' '

-
-       echo "foo(); " > x &&
+       echo "foo(); " >x &&

        git add x &&
        test_must_fail git diff --cached --check
        git add x &&
        test_must_fail git diff --cached --check

-

 '
 
 test_expect_success 'check staged with space before tab in indent' '
 '
 
 test_expect_success 'check staged with space before tab in indent' '

-

        # indent has space followed by hard tab
        # indent has space followed by hard tab

-       echo "  foo();" > x &&
+       echo "  foo();" >x &&

        git add x &&
        test_must_fail git diff --cached --check
        git add x &&
        test_must_fail git diff --cached --check

-

 '
 
 test_expect_success 'check with no whitespace errors (diff-index)' '
 '
 
 test_expect_success 'check with no whitespace errors (diff-index)' '

-
-       echo "foo();" > x &&
+       echo "foo();" >x &&

        git add x &&
        git diff-index --check HEAD
        git add x &&
        git diff-index --check HEAD

-

 '
 
 test_expect_success 'check with trailing whitespace (diff-index)' '
 '
 
 test_expect_success 'check with trailing whitespace (diff-index)' '

-
-       echo "foo(); " > x &&
+       echo "foo(); " >x &&

        git add x &&
        test_must_fail git diff-index --check HEAD
        git add x &&
        test_must_fail git diff-index --check HEAD

-

 '
 
 test_expect_success 'check with space before tab in indent (diff-index)' '
 '
 
 test_expect_success 'check with space before tab in indent (diff-index)' '

-

        # indent has space followed by hard tab
        # indent has space followed by hard tab

-       echo "  foo();" > x &&
+       echo "  foo();" >x &&

        git add x &&
        test_must_fail git diff-index --check HEAD
        git add x &&
        test_must_fail git diff-index --check HEAD

-

 '
 
 test_expect_success 'check staged with no whitespace errors (diff-index)' '
 '
 
 test_expect_success 'check staged with no whitespace errors (diff-index)' '

-
-       echo "foo();" > x &&
+       echo "foo();" >x &&

        git add x &&
        git diff-index --cached --check HEAD
        git add x &&
        git diff-index --cached --check HEAD

-

 '
 
 test_expect_success 'check staged with trailing whitespace (diff-index)' '
 '
 
 test_expect_success 'check staged with trailing whitespace (diff-index)' '

-
-       echo "foo(); " > x &&
+       echo "foo(); " >x &&

        git add x &&
        test_must_fail git diff-index --cached --check HEAD
        git add x &&
        test_must_fail git diff-index --cached --check HEAD

-

 '
 
 test_expect_success 'check staged with space before tab in indent (diff-index)' '
 '
 
 test_expect_success 'check staged with space before tab in indent (diff-index)' '

-

        # indent has space followed by hard tab
        # indent has space followed by hard tab

-       echo "  foo();" > x &&
+       echo "  foo();" >x &&

        git add x &&
        test_must_fail git diff-index --cached --check HEAD
        git add x &&
        test_must_fail git diff-index --cached --check HEAD

-

 '
 
 test_expect_success 'check with no whitespace errors (diff-tree)' '
 '
 
 test_expect_success 'check with no whitespace errors (diff-tree)' '

-
-       echo "foo();" > x &&
+       echo "foo();" >x &&

        git commit -m "new commit" x &&
        git diff-tree --check HEAD^ HEAD
        git commit -m "new commit" x &&
        git diff-tree --check HEAD^ HEAD

-

 '
 
 test_expect_success 'check with trailing whitespace (diff-tree)' '
 '
 
 test_expect_success 'check with trailing whitespace (diff-tree)' '

-
-       echo "foo(); " > x &&
+       echo "foo(); " >x &&

        git commit -m "another commit" x &&
        test_must_fail git diff-tree --check HEAD^ HEAD
        git commit -m "another commit" x &&
        test_must_fail git diff-tree --check HEAD^ HEAD

-

 '
 
 test_expect_success 'check with space before tab in indent (diff-tree)' '
 '
 
 test_expect_success 'check with space before tab in indent (diff-tree)' '

-

        # indent has space followed by hard tab
        # indent has space followed by hard tab

-       echo "  foo();" > x &&
+       echo "  foo();" >x &&

        git commit -m "yet another" x &&
        test_must_fail git diff-tree --check HEAD^ HEAD
        git commit -m "yet another" x &&
        test_must_fail git diff-tree --check HEAD^ HEAD

-

 '
 
 test_expect_success 'check trailing whitespace (trailing-space: off)' '
 '
 
 test_expect_success 'check trailing whitespace (trailing-space: off)' '

-

        git config core.whitespace "-trailing-space" &&
        git config core.whitespace "-trailing-space" &&

-       echo "foo ();   " > x &&
+       echo "foo ();   " >x &&

        git diff --check
        git diff --check

-

 '
 
 test_expect_success 'check trailing whitespace (trailing-space: on)' '
 '
 
 test_expect_success 'check trailing whitespace (trailing-space: on)' '

-

        git config core.whitespace "trailing-space" &&
        git config core.whitespace "trailing-space" &&

-       echo "foo ();   " > x &&
+       echo "foo ();   " >x &&

        test_must_fail git diff --check
        test_must_fail git diff --check

-

 '
 
 test_expect_success 'check space before tab in indent (space-before-tab: off)' '
 '
 
 test_expect_success 'check space before tab in indent (space-before-tab: off)' '

-

        # indent contains space followed by HT
        git config core.whitespace "-space-before-tab" &&
        # indent contains space followed by HT
        git config core.whitespace "-space-before-tab" &&

-       echo "  foo ();" > x &&
+       echo "  foo ();" >x &&

        git diff --check
        git diff --check

-

 '
 
 test_expect_success 'check space before tab in indent (space-before-tab: on)' '
 '
 
 test_expect_success 'check space before tab in indent (space-before-tab: on)' '

-

        # indent contains space followed by HT
        git config core.whitespace "space-before-tab" &&
        # indent contains space followed by HT
        git config core.whitespace "space-before-tab" &&

-       echo "  foo ();   " > x &&
+       echo "  foo ();   " >x &&

        test_must_fail git diff --check
        test_must_fail git diff --check

-

 '
 
 test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' '
 '
 
 test_expect_success 'check spaces as indentation (indent-with-non-tab: off)' '

-

        git config core.whitespace "-indent-with-non-tab" &&
        git config core.whitespace "-indent-with-non-tab" &&

-       echo "        foo ();" > x &&
+       echo "        foo ();" >x &&

        git diff --check
        git diff --check

-

 '
 
 test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' '
 '
 
 test_expect_success 'check spaces as indentation (indent-with-non-tab: on)' '

-

        git config core.whitespace "indent-with-non-tab" &&
        git config core.whitespace "indent-with-non-tab" &&

-       echo "        foo ();" > x &&
+       echo "        foo ();" >x &&

        test_must_fail git diff --check
        test_must_fail git diff --check

-

 '
 
 test_expect_success 'ditto, but tabwidth=9' '
 '
 
 test_expect_success 'ditto, but tabwidth=9' '

-

        git config core.whitespace "indent-with-non-tab,tabwidth=9" &&
        git diff --check
        git config core.whitespace "indent-with-non-tab,tabwidth=9" &&
        git diff --check

-

 '
 
 test_expect_success 'check tabs and spaces as indentation (indent-with-non-tab: on)' '
 '
 
 test_expect_success 'check tabs and spaces as indentation (indent-with-non-tab: on)' '

-

        git config core.whitespace "indent-with-non-tab" &&
        git config core.whitespace "indent-with-non-tab" &&

-       echo "                  foo ();" > x &&
+       echo "                  foo ();" >x &&

        test_must_fail git diff --check
        test_must_fail git diff --check

-

 '
 
 test_expect_success 'ditto, but tabwidth=10' '
 '
 
 test_expect_success 'ditto, but tabwidth=10' '

-

        git config core.whitespace "indent-with-non-tab,tabwidth=10" &&
        test_must_fail git diff --check
        git config core.whitespace "indent-with-non-tab,tabwidth=10" &&
        test_must_fail git diff --check

-

 '
 
 test_expect_success 'ditto, but tabwidth=20' '
 '
 
 test_expect_success 'ditto, but tabwidth=20' '

-

        git config core.whitespace "indent-with-non-tab,tabwidth=20" &&
        git diff --check
        git config core.whitespace "indent-with-non-tab,tabwidth=20" &&
        git diff --check

-

 '
 
 test_expect_success 'check tabs as indentation (tab-in-indent: off)' '
 '
 
 test_expect_success 'check tabs as indentation (tab-in-indent: off)' '

-

        git config core.whitespace "-tab-in-indent" &&
        git config core.whitespace "-tab-in-indent" &&

-       echo "  foo ();" > x &&
+       echo "  foo ();" >x &&

        git diff --check
        git diff --check

-

 '
 
 test_expect_success 'check tabs as indentation (tab-in-indent: on)' '
 '
 
 test_expect_success 'check tabs as indentation (tab-in-indent: on)' '

-

        git config core.whitespace "tab-in-indent" &&
        git config core.whitespace "tab-in-indent" &&

-       echo "  foo ();" > x &&
+       echo "  foo ();" >x &&

        test_must_fail git diff --check
        test_must_fail git diff --check

-

 '
 
 test_expect_success 'check tabs and spaces as indentation (tab-in-indent: on)' '
 '
 
 test_expect_success 'check tabs and spaces as indentation (tab-in-indent: on)' '

-

        git config core.whitespace "tab-in-indent" &&
        git config core.whitespace "tab-in-indent" &&

-       echo "                  foo ();" > x &&
+       echo "                  foo ();" >x &&

        test_must_fail git diff --check
        test_must_fail git diff --check

-

 '
 
 test_expect_success 'ditto, but tabwidth=1 (must be irrelevant)' '
 '
 
 test_expect_success 'ditto, but tabwidth=1 (must be irrelevant)' '

-

        git config core.whitespace "tab-in-indent,tabwidth=1" &&
        test_must_fail git diff --check
        git config core.whitespace "tab-in-indent,tabwidth=1" &&
        test_must_fail git diff --check

-

 '
 
 test_expect_success 'check tab-in-indent and indent-with-non-tab conflict' '
 '
 
 test_expect_success 'check tab-in-indent and indent-with-non-tab conflict' '

-

        git config core.whitespace "tab-in-indent,indent-with-non-tab" &&
        git config core.whitespace "tab-in-indent,indent-with-non-tab" &&

-       echo "foo ();" > x &&
+       echo "foo ();" >x &&

        test_must_fail git diff --check
        test_must_fail git diff --check

-

 '
 
 test_expect_success 'check tab-in-indent excluded from wildcard whitespace attribute' '
 '
 
 test_expect_success 'check tab-in-indent excluded from wildcard whitespace attribute' '

-

        git config --unset core.whitespace &&
        git config --unset core.whitespace &&

-       echo "x whitespace" > .gitattributes &&
-       echo "    foo ();" > x &&
+       echo "x whitespace" >.gitattributes &&
+       echo "    foo ();" >x &&

        git diff --check &&
        rm -f .gitattributes
        git diff --check &&
        rm -f .gitattributes

-

 '
 
 test_expect_success 'line numbers in --check output are correct' '
 '
 
 test_expect_success 'line numbers in --check output are correct' '

-
-       echo "" > x &&
-       echo "foo(); " >> x &&
+       echo "" >x &&
+       echo "foo(); " >>x &&

        git diff --check | grep "x:2:"
        git diff --check | grep "x:2:"

-

 '
 
 test_expect_success 'checkdiff detects new trailing blank lines (1)' '
 '
 
 test_expect_success 'checkdiff detects new trailing blank lines (1)' '


@@ -878,26 +812,27 @@ test_expect_success 'setup diff colors' '
        git config color.diff.commit yellow &&
        git config color.diff.whitespace "normal red" &&
 
        git config color.diff.commit yellow &&
        git config color.diff.whitespace "normal red" &&
 

-       git config core.autocrlf false
+       git config core.autocrlf false &&
+
+       cat >expected <<-\EOF
+       <BOLD>diff --git a/x b/x<RESET>
+       <BOLD>index 9daeafb..2874b91 100644<RESET>
+       <BOLD>--- a/x<RESET>
+       <BOLD>+++ b/x<RESET>
+       <CYAN>@@ -1 +1,4 @@<RESET>
+        test<RESET>
+       <GREEN>+<RESET><GREEN>{<RESET>
+       <GREEN>+<RESET><BRED>   <RESET>
+       <GREEN>+<RESET><GREEN>}<RESET>
+       EOF

 '
 '

-cat >expected <<\EOF
-<BOLD>diff --git a/x b/x<RESET>
-<BOLD>index 9daeafb..2874b91 100644<RESET>
-<BOLD>--- a/x<RESET>
-<BOLD>+++ b/x<RESET>
-<CYAN>@@ -1 +1,4 @@<RESET>
- test<RESET>
-<GREEN>+<RESET><GREEN>{<RESET>
-<GREEN>+<RESET><BRED>  <RESET>
-<GREEN>+<RESET><GREEN>}<RESET>
-EOF

 
 test_expect_success 'diff that introduces a line with only tabs' '
        git config core.whitespace blank-at-eol &&
        git reset --hard &&
 
 test_expect_success 'diff that introduces a line with only tabs' '
        git config core.whitespace blank-at-eol &&
        git reset --hard &&

-       echo "test" > x &&
+       echo "test" >x &&

        git commit -m "initial" x &&
        git commit -m "initial" x &&

-       echo "{NTN}" | tr "NT" "\n\t" >> x &&
+       echo "{NTN}" | tr "NT" "\n\t" >>x &&

        git -c color.diff=always diff | test_decode_color >current &&
        test_cmp expected current
 '
        git -c color.diff=always diff | test_decode_color >current &&
        test_cmp expected current
 '