t0000-t0999: fix broken &&-chains

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index af61d083b452c7973a2a703ef35fb57b76af84da..34859fe4a59fdbb48273f4b9e4f16e878b421349 100755 (executable)
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -1081,7 +1081,7 @@ test_expect_success 'very long name in the index handled sanely' '
        (
                git ls-files -s path4 |
                sed -e "s/      .*/     /" |
        (
                git ls-files -s path4 |
                sed -e "s/      .*/     /" |

-               tr -d "\012"
+               tr -d "\012" &&

                echo "$a"
        ) | git update-index --index-info &&
        len=$(git ls-files "a*" | wc -c) &&
                echo "$a"
        ) | git update-index --index-info &&
        len=$(git ls-files "a*" | wc -c) &&

diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index f19ae4f8ccddacee84e04fa50663672f5f6174c1..5c37c2e1f8c3e96ae72dea1c7a5eef556fb18d00 100755 (executable)
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -34,15 +34,15 @@ test_expect_success 'open-quoted pathname' '
 test_expect_success 'setup' '
        mkdir -p a/b/d a/c b &&
        (
 test_expect_success 'setup' '
        mkdir -p a/b/d a/c b &&
        (

-               echo "[attr]notest !test"
-               echo "\" d \"   test=d"
-               echo " e        test=e"
-               echo " e\"      test=e"
-               echo "f test=f"
-               echo "a/i test=a/i"
-               echo "onoff test -test"
-               echo "offon -test test"
-               echo "no notest"
+               echo "[attr]notest !test" &&
+               echo "\" d \"   test=d" &&
+               echo " e        test=e" &&
+               echo " e\"      test=e" &&
+               echo "f test=f" &&
+               echo "a/i test=a/i" &&
+               echo "onoff test -test" &&
+               echo "offon -test test" &&
+               echo "no notest" &&

                echo "A/e/F test=A/e/F"
        ) >.gitattributes &&
        (
                echo "A/e/F test=A/e/F"
        ) >.gitattributes &&
        (


@@ -51,7 +51,7 @@ test_expect_success 'setup' '
        ) >a/.gitattributes &&
        (
                echo "h test=a/b/h" &&
        ) >a/.gitattributes &&
        (
                echo "h test=a/b/h" &&

-               echo "d/* test=a/b/d/*"
+               echo "d/* test=a/b/d/*" &&

                echo "d/yes notest"
        ) >a/b/.gitattributes &&
        (
                echo "d/yes notest"
        ) >a/b/.gitattributes &&
        (


@@ -287,7 +287,7 @@ test_expect_success 'bare repository: check that .gitattribute is ignored' '
        (
                cd bare.git &&
                (
        (
                cd bare.git &&
                (

-                       echo "f test=f"
+                       echo "f test=f" &&

                        echo "a/i test=a/i"
                ) >.gitattributes &&
                attr_check f unspecified &&
                        echo "a/i test=a/i"
                ) >.gitattributes &&
                attr_check f unspecified &&


@@ -312,7 +312,7 @@ test_expect_success 'bare repository: test info/attributes' '
        (
                cd bare.git &&
                (
        (
                cd bare.git &&
                (

-                       echo "f test=f"
+                       echo "f test=f" &&

                        echo "a/i test=a/i"
                ) >info/attributes &&
                attr_check f f &&
                        echo "a/i test=a/i"
                ) >info/attributes &&
                attr_check f f &&

diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 9479a4aaabc1a4187fc702f864642ac493508bb9..6a213608cc10fc29691f8bf293b0a34ce1f93c5e 100755 (executable)
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -785,7 +785,7 @@ test_expect_success PERL 'missing file in delayed checkout' '
                cd repo &&
                git init &&
                echo "*.a filter=bug" >.gitattributes &&
                cd repo &&
                git init &&
                echo "*.a filter=bug" >.gitattributes &&

-               cp "$TEST_ROOT/test.o" missing-delay.a
+               cp "$TEST_ROOT/test.o" missing-delay.a &&

                git add . &&
                git commit -m "test commit"
        ) &&
                git add . &&
                git commit -m "test commit"
        ) &&


@@ -807,7 +807,7 @@ test_expect_success PERL 'invalid file in delayed checkout' '
                git init &&
                echo "*.a filter=bug" >.gitattributes &&
                cp "$TEST_ROOT/test.o" invalid-delay.a &&
                git init &&
                echo "*.a filter=bug" >.gitattributes &&
                cp "$TEST_ROOT/test.o" invalid-delay.a &&

-               cp "$TEST_ROOT/test.o" unfiltered
+               cp "$TEST_ROOT/test.o" unfiltered &&

                git add . &&
                git commit -m "test commit"
        ) &&
                git add . &&
                git commit -m "test commit"
        ) &&