t4000-t4999: fix broken &&-chains

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

diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index bf4030371a9fc8f5abe7e88d84c98a097b9821dd..c16486a9d41a125610e6280a79e958ebbb792653 100755 (executable)
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -180,7 +180,7 @@ test_expect_success 'setup for many rename source candidates' '
        git add "path??" &&
        test_tick &&
        git commit -m "hundred" &&
-       (cat path1; echo new) >new-path &&
+       (cat path1 && echo new) >new-path &&
        echo old >>path1 &&
        git add new-path path1 &&
        git diff -l 4 -C -C --cached --name-status >actual 2>actual.err &&

diff --git a/t/t4024-diff-optimize-common.sh b/t/t4024-diff-optimize-common.sh
index 7e76018296c8f0c51b7187c96330d6e0a70a2fe4..6b44ce14933f8ceaa7e5e93eb9eaa0ff2527b66c 100755 (executable)
--- a/t/t4024-diff-optimize-common.sh
+++ b/t/t4024-diff-optimize-common.sh
@@ -127,17 +127,17 @@ test_expect_success setup '
 
        for n in $sample
        do
-               ( zs $n ; echo a ) >file-a$n &&
-               ( echo b; zs $n; echo ) >file-b$n &&
-               ( printf c; zs $n ) >file-c$n &&
-               ( echo d; zs $n ) >file-d$n &&
+               ( zs $n && echo a ) >file-a$n &&
+               ( echo b && zs $n && echo ) >file-b$n &&
+               ( printf c && zs $n ) >file-c$n &&
+               ( echo d && zs $n ) >file-d$n &&
 
                git add file-a$n file-b$n file-c$n file-d$n &&
 
-               ( zs $n ; echo A ) >file-a$n &&
-               ( echo B; zs $n; echo ) >file-b$n &&
-               ( printf C; zs $n ) >file-c$n &&
-               ( echo D; zs $n ) >file-d$n &&
+               ( zs $n && echo A ) >file-a$n &&
+               ( echo B && zs $n && echo ) >file-b$n &&
+               ( printf C && zs $n ) >file-c$n &&
+               ( echo D && zs $n ) >file-d$n &&
 
                expect_pattern $n || return 1
 

diff --git a/t/t4025-hunk-header.sh b/t/t4025-hunk-header.sh
index 7a3dbc1ea22fd19a54da8949abc368c112377b19..fa44e788695c6f3226ad17cb6e8f2b8e256814ed 100755 (executable)
--- a/t/t4025-hunk-header.sh
+++ b/t/t4025-hunk-header.sh
@@ -12,12 +12,12 @@ NS="$N$N$N$N$N$N$N$N$N$N$N$N$N"
 test_expect_success setup '
 
        (
-               echo "A $NS"
+               echo "A $NS" &&
                for c in B C D E F G H I J K
                do
                        echo "  $c"
-               done
-               echo "L  $NS"
+               done &&
+               echo "L  $NS" &&
                for c in M N O P Q R S T U V
                do
                        echo "  $c"
@@ -34,7 +34,7 @@ test_expect_success 'hunk header truncation with an overly long line' '
 
        git diff | sed -n -e "s/^.*@@//p" >actual &&
        (
-               echo " A $N$N$N$N$N$N$N$N$N2"
+               echo " A $N$N$N$N$N$N$N$N$N2" &&
                echo " L  $N$N$N$N$N$N$N$N$N1"
        ) >expected &&
        test_cmp actual expected

diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index 058ee0829ded8163f99325494f326ef6609fee06..4e3499ef84c1bc3bb26857d70bf7f5ba78d5bf9a 100755 (executable)
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -498,7 +498,7 @@ test_expect_success 'given commit --submodule=short' '
 test_expect_success 'setup .git file for sm2' '
        (cd sm2 &&
         REAL="$(pwd)/../.real" &&
-        mv .git "$REAL"
+        mv .git "$REAL" &&
         echo "gitdir: $REAL" >.git)
 '
 
@@ -527,7 +527,7 @@ test_expect_success 'diff --submodule with objects referenced by alternates' '
                git commit -m "sub a"
        ) &&
        (cd sub_alt &&
-               sha1_before=$(git rev-parse --short HEAD)
+               sha1_before=$(git rev-parse --short HEAD) &&
                echo b >b &&
                git add b &&
                git commit -m b &&

diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh
index 4b168d0ed7ff2bbb1d93895de7fdf3f14bfe334e..0eba4620f039aaa529afa2cf3fbcff2559857b9e 100755 (executable)
--- a/t/t4060-diff-submodule-option-diff-format.sh
+++ b/t/t4060-diff-submodule-option-diff-format.sh
@@ -721,7 +721,7 @@ test_expect_success 'given commit' '
 test_expect_success 'setup .git file for sm2' '
        (cd sm2 &&
         REAL="$(pwd)/../.real" &&
-        mv .git "$REAL"
+        mv .git "$REAL" &&
         echo "gitdir: $REAL" >.git)
 '
 

diff --git a/t/t4121-apply-diffs.sh b/t/t4121-apply-diffs.sh
index aff551a1d787477eb2db34d96217f66ca03c435d..66368effd5c04ebeaeba30e30eaf9ba9d7cf262a 100755 (executable)
--- a/t/t4121-apply-diffs.sh
+++ b/t/t4121-apply-diffs.sh
@@ -27,6 +27,6 @@ test_expect_success 'setup' \
 
 test_expect_success \
        'check if contextually independent diffs for the same file apply' \
-       '( git diff test~2 test~1; git diff test~1 test~0 )| git apply'
+       '( git diff test~2 test~1 && git diff test~1 test~0 )| git apply'
 
 test_done