t9000-t9999: fix broken &&-chains

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

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 776769fe0df6e9ba9ce7a67c92489f5f319f6455..53314ff54e4e186bfef99877ac1f5aa082c8eab6 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -330,7 +330,7 @@ test_expect_success $PREREQ 'Show all headers' '
 
 test_expect_success $PREREQ 'Prompting works' '
        clean_fake_sendmail &&
 
 test_expect_success $PREREQ 'Prompting works' '
        clean_fake_sendmail &&

-       (echo "to@example.com"
+       (echo "to@example.com" &&

         echo ""
        ) | GIT_SEND_EMAIL_NOTTY=1 git send-email \
                --smtp-server="$(pwd)/fake.sendmail" \
         echo ""
        ) | GIT_SEND_EMAIL_NOTTY=1 git send-email \
                --smtp-server="$(pwd)/fake.sendmail" \


@@ -470,8 +470,8 @@ test_expect_success $PREREQ 'Invalid In-Reply-To' '
 
 test_expect_success $PREREQ 'Valid In-Reply-To when prompting' '
        clean_fake_sendmail &&
 
 test_expect_success $PREREQ 'Valid In-Reply-To when prompting' '
        clean_fake_sendmail &&

-       (echo "From Example <from@example.com>"
-        echo "To Example <to@example.com>"
+       (echo "From Example <from@example.com>" &&
+        echo "To Example <to@example.com>" &&

         echo ""
        ) | GIT_SEND_EMAIL_NOTTY=1 git send-email \
                --smtp-server="$(pwd)/fake.sendmail" \
         echo ""
        ) | GIT_SEND_EMAIL_NOTTY=1 git send-email \
                --smtp-server="$(pwd)/fake.sendmail" \

diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index c937330a5f3a7f6b5c4d8e406564bd88dd0c889b..9af60788443a9e69f3ffa7eca079a15f5bafc457 100755 (executable)
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -31,7 +31,7 @@ test_expect_success \
        (
                cd import &&
                echo foo >foo &&
        (
                cd import &&
                echo foo >foo &&

-               ln -s foo foo.link
+               ln -s foo foo.link &&

                mkdir -p dir/a/b/c/d/e &&
                echo "deep dir" >dir/a/b/c/d/e/file &&
                mkdir bar &&
                mkdir -p dir/a/b/c/d/e &&
                echo "deep dir" >dir/a/b/c/d/e/file &&
                mkdir bar &&

diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index 07bfb63777c80f7e508e632faa9f9ce1823d90ea..8a5c8dc1aad6d036964776d9e3fe2ecd0a893305 100755 (executable)
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -149,7 +149,7 @@ test_expect_success 'test show-ignore' "
                svn_cmd up &&
                svn_cmd propset -R svn:ignore '
 no-such-file*
                svn_cmd up &&
                svn_cmd propset -R svn:ignore '
 no-such-file*

-' .
+' . &&

                svn_cmd commit -m 'propset svn:ignore'
        ) &&
        git svn show-ignore > show-ignore.got &&
                svn_cmd commit -m 'propset svn:ignore'
        ) &&
        git svn show-ignore > show-ignore.got &&

diff --git a/t/t9122-git-svn-author.sh b/t/t9122-git-svn-author.sh
index 30013b7bb948640869d5c5208b2feeb08c011b73..9e8fe38e7ef94b7343122b279c94c250dcf48756 100755 (executable)
--- a/t/t9122-git-svn-author.sh
+++ b/t/t9122-git-svn-author.sh
@@ -7,8 +7,8 @@ test_expect_success 'setup svn repository' '
        svn_cmd checkout "$svnrepo" work.svn &&
        (
                cd work.svn &&
        svn_cmd checkout "$svnrepo" work.svn &&
        (
                cd work.svn &&

-               echo >file
-               svn_cmd add file
+               echo >file &&
+               svn_cmd add file &&

                svn_cmd commit -m "first commit" file
        )
 '
                svn_cmd commit -m "first commit" file
        )
 '


@@ -17,7 +17,7 @@ test_expect_success 'interact with it via git svn' '
        mkdir work.git &&
        (
                cd work.git &&
        mkdir work.git &&
        (
                cd work.git &&

-               git svn init "$svnrepo"
+               git svn init "$svnrepo" &&

                git svn fetch &&
 
                echo modification >file &&
                git svn fetch &&
 
                echo modification >file &&

diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
index 8dbd6476fa181dc7a2b3f0b6a9dfff57155c9eea..2c213ae65405ecc5253a01369ce4b76f96272f10 100755 (executable)
--- a/t/t9129-git-svn-i18n-commitencoding.sh
+++ b/t/t9129-git-svn-i18n-commitencoding.sh
@@ -51,7 +51,7 @@ do
                git add F &&
                git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
                E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
                git add F &&
                git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
                E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&

-               test "z$E" = "z$H"
+               test "z$E" = "z$H" &&

                compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
        )
        '
                compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
        )
        '

diff --git a/t/t9130-git-svn-authors-file.sh b/t/t9130-git-svn-authors-file.sh
index d8262854bbee335aec293b8f75b9979e60b91171..cb764bcadc72cd954d3727f6fbc4d1e0d1fe6c46 100755 (executable)
--- a/t/t9130-git-svn-authors-file.sh
+++ b/t/t9130-git-svn-authors-file.sh
@@ -25,7 +25,7 @@ test_expect_success 'start import with incomplete authors file' '
 
 test_expect_success 'imported 2 revisions successfully' '
        (
 
 test_expect_success 'imported 2 revisions successfully' '
        (

-               cd x
+               cd x &&

                git rev-list refs/remotes/git-svn >actual &&
                test_line_count = 2 actual &&
                git rev-list -1 --pretty=raw refs/remotes/git-svn >actual &&
                git rev-list refs/remotes/git-svn >actual &&
                test_line_count = 2 actual &&
                git rev-list -1 --pretty=raw refs/remotes/git-svn >actual &&


@@ -42,7 +42,7 @@ EOF
 
 test_expect_success 'continues to import once authors have been added' '
        (
 
 test_expect_success 'continues to import once authors have been added' '
        (

-               cd x
+               cd x &&

                git svn fetch --authors-file=../svn-authors &&
                git rev-list refs/remotes/git-svn >actual &&
                test_line_count = 4 actual &&
                git svn fetch --authors-file=../svn-authors &&
                git rev-list refs/remotes/git-svn >actual &&
                test_line_count = 4 actual &&

diff --git a/t/t9134-git-svn-ignore-paths.sh b/t/t9134-git-svn-ignore-paths.sh
index 09ff10cd9b0688522671cac9ee2c8886a8587947..fff49c4100852b28899c6694a33acd3b96b188b8 100755 (executable)
--- a/t/t9134-git-svn-ignore-paths.sh
+++ b/t/t9134-git-svn-ignore-paths.sh
@@ -82,7 +82,7 @@ test_expect_success 'update git svn-cloned repo (option ignore)' '
 test_expect_success 'SVN-side change inside of ignored www' '
        (
                cd s &&
 test_expect_success 'SVN-side change inside of ignored www' '
        (
                cd s &&

-               echo zaq >> www/test_www.txt
+               echo zaq >> www/test_www.txt &&

                svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
                svn_cmd up &&
                svn_cmd log -v | fgrep "SVN-side change inside of www/test_www.txt"
                svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
                svn_cmd up &&
                svn_cmd log -v | fgrep "SVN-side change inside of www/test_www.txt"


@@ -114,8 +114,8 @@ test_expect_success 'update git svn-cloned repo (option ignore)' '
 test_expect_success 'SVN-side change in and out of ignored www' '
        (
                cd s &&
 test_expect_success 'SVN-side change in and out of ignored www' '
        (
                cd s &&

-               echo cvf >> www/test_www.txt
-               echo ygg >> qqq/test_qqq.txt
+               echo cvf >> www/test_www.txt &&
+               echo ygg >> qqq/test_qqq.txt &&

                svn_cmd commit -m "SVN-side change in and out of ignored www" &&
                svn_cmd up &&
                svn_cmd log -v | fgrep "SVN-side change in and out of ignored www"
                svn_cmd commit -m "SVN-side change in and out of ignored www" &&
                svn_cmd up &&
                svn_cmd log -v | fgrep "SVN-side change in and out of ignored www"

diff --git a/t/t9137-git-svn-dcommit-clobber-series.sh b/t/t9137-git-svn-dcommit-clobber-series.sh
index 5fa07a369ff06f739a9edea2a8924fc3f19a88ca..067b15bad2508cc01614f8b1a01aeab7cac916dc 100755 (executable)
--- a/t/t9137-git-svn-dcommit-clobber-series.sh
+++ b/t/t9137-git-svn-dcommit-clobber-series.sh
@@ -7,7 +7,7 @@ test_description='git svn dcommit clobber series'
 test_expect_success 'initialize repo' '
        mkdir import &&
        (cd import &&
 test_expect_success 'initialize repo' '
        mkdir import &&
        (cd import &&

-       awk "BEGIN { for (i = 1; i < 64; i++) { print i } }" > file
+       awk "BEGIN { for (i = 1; i < 64; i++) { print i } }" > file &&

        svn_cmd import -m "initial" . "$svnrepo"
        ) &&
        git svn init "$svnrepo" &&
        svn_cmd import -m "initial" . "$svnrepo"
        ) &&
        git svn init "$svnrepo" &&

diff --git a/t/t9138-git-svn-authors-prog.sh b/t/t9138-git-svn-authors-prog.sh
index 93ef44fae8f28149344b9125530807ed49727e68..027b416720ddf774ffd52e9bd3267b009bd70899 100755 (executable)
--- a/t/t9138-git-svn-authors-prog.sh
+++ b/t/t9138-git-svn-authors-prog.sh
@@ -38,7 +38,7 @@ test_expect_success 'import authors with prog and file' '
 
 test_expect_success 'imported 6 revisions successfully' '
        (
 
 test_expect_success 'imported 6 revisions successfully' '
        (

-               cd x
+               cd x &&

                git rev-list refs/remotes/git-svn >actual &&
                test_line_count = 6 actual
        )
                git rev-list refs/remotes/git-svn >actual &&
                test_line_count = 6 actual
        )


@@ -46,7 +46,7 @@ test_expect_success 'imported 6 revisions successfully' '
 
 test_expect_success 'authors-prog ran correctly' '
        (
 
 test_expect_success 'authors-prog ran correctly' '
        (

-               cd x
+               cd x &&

                git rev-list -1 --pretty=raw refs/remotes/git-svn~1 >actual &&
                grep "^author ee-foo <ee-foo@example\.com> " actual &&
                git rev-list -1 --pretty=raw refs/remotes/git-svn~2 >actual &&
                git rev-list -1 --pretty=raw refs/remotes/git-svn~1 >actual &&
                grep "^author ee-foo <ee-foo@example\.com> " actual &&
                git rev-list -1 --pretty=raw refs/remotes/git-svn~2 >actual &&


@@ -62,7 +62,7 @@ test_expect_success 'authors-prog ran correctly' '
 
 test_expect_success 'authors-file overrode authors-prog' '
        (
 
 test_expect_success 'authors-file overrode authors-prog' '
        (

-               cd x
+               cd x &&

                git rev-list -1 --pretty=raw refs/remotes/git-svn >actual &&
                grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> " actual
        )
                git rev-list -1 --pretty=raw refs/remotes/git-svn >actual &&
                grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> " actual
        )

diff --git a/t/t9146-git-svn-empty-dirs.sh b/t/t9146-git-svn-empty-dirs.sh
index 6d3130e61856335dff7004903741a490ae94fc08..5f91c0d68b4582958e2ba5e20e888b9369e6a3f4 100755 (executable)
--- a/t/t9146-git-svn-empty-dirs.sh
+++ b/t/t9146-git-svn-empty-dirs.sh
@@ -21,7 +21,7 @@ test_expect_success 'empty directories exist' '
                do
                        if ! test -d "$i"
                        then
                do
                        if ! test -d "$i"
                        then

-                               echo >&2 "$i does not exist"
+                               echo >&2 "$i does not exist" &&

                                exit 1
                        fi
                done
                                exit 1
                        fi
                done


@@ -38,7 +38,7 @@ test_expect_success 'option automkdirs set to false' '
                do
                        if test -d "$i"
                        then
                do
                        if test -d "$i"
                        then

-                               echo >&2 "$i exists"
+                               echo >&2 "$i exists" &&

                                exit 1
                        fi
                done
                                exit 1
                        fi
                done


@@ -63,7 +63,7 @@ test_expect_success 'git svn mkdirs recreates empty directories' '
                do
                        if ! test -d "$i"
                        then
                do
                        if ! test -d "$i"
                        then

-                               echo >&2 "$i does not exist"
+                               echo >&2 "$i does not exist" &&

                                exit 1
                        fi
                done
                                exit 1
                        fi
                done


@@ -79,21 +79,21 @@ test_expect_success 'git svn mkdirs -r works' '
                do
                        if ! test -d "$i"
                        then
                do
                        if ! test -d "$i"
                        then

-                               echo >&2 "$i does not exist"
+                               echo >&2 "$i does not exist" &&

                                exit 1
                        fi
                                exit 1
                        fi

-               done
+               done &&

 
                if test -d "! !"
                then
 
                if test -d "! !"
                then

-                       echo >&2 "$i should not exist"
+                       echo >&2 "$i should not exist" &&

                        exit 1
                        exit 1

-               fi
+               fi &&

 
                git svn mkdirs -r8 &&
                if ! test -d "! !"
                then
 
                git svn mkdirs -r8 &&
                if ! test -d "! !"
                then

-                       echo >&2 "$i not exist"
+                       echo >&2 "$i not exist" &&

                        exit 1
                fi
        )
                        exit 1
                fi
        )


@@ -115,7 +115,7 @@ test_expect_success 'empty directories in trunk exist' '
                do
                        if ! test -d "$i"
                        then
                do
                        if ! test -d "$i"
                        then

-                               echo >&2 "$i does not exist"
+                               echo >&2 "$i does not exist" &&

                                exit 1
                        fi
                done
                                exit 1
                        fi
                done


@@ -148,7 +148,7 @@ test_expect_success 'git svn gc-ed files work' '
                        do
                                if ! test -d "$i"
                                then
                        do
                                if ! test -d "$i"
                                then

-                                       echo >&2 "$i does not exist"
+                                       echo >&2 "$i does not exist" &&

                                        exit 1
                                fi
                        done
                                        exit 1
                                fi
                        done

diff --git a/t/t9147-git-svn-include-paths.sh b/t/t9147-git-svn-include-paths.sh
index a90ff58629341ce41e29a9c06ec453c8d066f31a..d292bf9f55cdbedefca4e3e0777dd1f701dea9be 100755 (executable)
--- a/t/t9147-git-svn-include-paths.sh
+++ b/t/t9147-git-svn-include-paths.sh
@@ -84,7 +84,7 @@ test_expect_success 'update git svn-cloned repo (option include)' '
 test_expect_success 'SVN-side change inside of ignored www' '
        (
                cd s &&
 test_expect_success 'SVN-side change inside of ignored www' '
        (
                cd s &&

-               echo zaq >> www/test_www.txt
+               echo zaq >> www/test_www.txt &&

                svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
                svn_cmd up &&
                svn_cmd log -v | fgrep "SVN-side change inside of www/test_www.txt"
                svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
                svn_cmd up &&
                svn_cmd log -v | fgrep "SVN-side change inside of www/test_www.txt"


@@ -116,8 +116,8 @@ test_expect_success 'update git svn-cloned repo (option include)' '
 test_expect_success 'SVN-side change in and out of included qqq' '
        (
                cd s &&
 test_expect_success 'SVN-side change in and out of included qqq' '
        (
                cd s &&

-               echo cvf >> www/test_www.txt
-               echo ygg >> qqq/test_qqq.txt
+               echo cvf >> www/test_www.txt &&
+               echo ygg >> qqq/test_qqq.txt &&

                svn_cmd commit -m "SVN-side change in and out of ignored www" &&
                svn_cmd up &&
                svn_cmd log -v | fgrep "SVN-side change in and out of ignored www"
                svn_cmd commit -m "SVN-side change in and out of ignored www" &&
                svn_cmd up &&
                svn_cmd log -v | fgrep "SVN-side change in and out of ignored www"

diff --git a/t/t9152-svn-empty-dirs-after-gc.sh b/t/t9152-svn-empty-dirs-after-gc.sh
index 301e7797097cbf8eb39d87fc9535166c9fb5de2a..89f285d082965c0b8f0d8cbee226f3c8e2a75cfd 100755 (executable)
--- a/t/t9152-svn-empty-dirs-after-gc.sh
+++ b/t/t9152-svn-empty-dirs-after-gc.sh
@@ -30,7 +30,7 @@ test_expect_success 'git svn mkdirs recreates empty directories after git svn gc
                do
                        if ! test -d "$i"
                        then
                do
                        if ! test -d "$i"
                        then

-                               echo >&2 "$i does not exist"
+                               echo >&2 "$i does not exist" &&

                                exit 1
                        fi
                done
                                exit 1
                        fi
                done

diff --git a/t/t9164-git-svn-dcommit-concurrent.sh b/t/t9164-git-svn-dcommit-concurrent.sh
index d8464d4218316a51aa0db70bc57919d083d647ac..90346ff4e92ac06d6ca9fd8ea7b5b7d4f1f7f374 100755 (executable)
--- a/t/t9164-git-svn-dcommit-concurrent.sh
+++ b/t/t9164-git-svn-dcommit-concurrent.sh
@@ -12,7 +12,7 @@ test_expect_success 'setup svn repository' '
        svn_cmd checkout "$svnrepo" work.svn &&
        (
                cd work.svn &&
        svn_cmd checkout "$svnrepo" work.svn &&
        (
                cd work.svn &&

-               echo >file && echo > auto_updated_file
+               echo >file && echo > auto_updated_file &&

                svn_cmd add file auto_updated_file &&
                svn_cmd commit -m "initial commit"
        ) &&
                svn_cmd add file auto_updated_file &&
                svn_cmd commit -m "initial commit"
        ) &&

diff --git a/t/t9165-git-svn-fetch-merge-branch-of-branch.sh b/t/t9165-git-svn-fetch-merge-branch-of-branch.sh
index fa3ef3b1f7408840cabc5eacb1b1851f1c8afaac..a4813c2b09ce9f508fb38b463f8bbcd48851e1d2 100755 (executable)
--- a/t/t9165-git-svn-fetch-merge-branch-of-branch.sh
+++ b/t/t9165-git-svn-fetch-merge-branch-of-branch.sh
@@ -39,7 +39,7 @@ test_expect_success 'initialize source svn repo' '
                svn_cmd commit -m trunk &&
                svn_cmd switch "$svnrepo"/branches/branch2 &&
                svn_cmd merge "$svnrepo"/trunk &&
                svn_cmd commit -m trunk &&
                svn_cmd switch "$svnrepo"/branches/branch2 &&
                svn_cmd merge "$svnrepo"/trunk &&

-               svn_cmd commit -m "merge trunk"
+               svn_cmd commit -m "merge trunk" &&

                svn_cmd switch "$svnrepo"/trunk &&
                svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 &&
                svn_cmd commit -m "merge branch2"
                svn_cmd switch "$svnrepo"/trunk &&
                svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 &&
                svn_cmd commit -m "merge branch2"

diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
index 1319415ba8ec04f2b9d34ec984d3f8afb61fb551..cd61288aa1a9476819bd9b19b888e9e1b75f1da5 100755 (executable)
--- a/t/t9200-git-cvsexportcommit.sh
+++ b/t/t9200-git-cvsexportcommit.sh
@@ -187,7 +187,7 @@ test_expect_success \
       git commit -a -m "Update with spaces" &&
       id=$(git rev-list --max-count=1 HEAD) &&
       (cd "$CVSWORK" &&
       git commit -a -m "Update with spaces" &&
       id=$(git rev-list --max-count=1 HEAD) &&
       (cd "$CVSWORK" &&

-      git cvsexportcommit -c $id
+      git cvsexportcommit -c $id &&

       check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/"
       )'
 
       check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/"
       )'
 


@@ -245,7 +245,7 @@ test_expect_success FILEMODE \
       git add G/off &&
       git commit -a -m "Execute test" &&
       (cd "$CVSWORK" &&
       git add G/off &&
       git commit -a -m "Execute test" &&
       (cd "$CVSWORK" &&

-      git cvsexportcommit -c HEAD
+      git cvsexportcommit -c HEAD &&

       test -x G/on &&
       ! test -x G/off
       )'
       test -x G/on &&
       ! test -x G/off
       )'


@@ -303,7 +303,7 @@ test_expect_success 're-commit a removed filename which remains in CVS attic' '
     git add attic_gremlin &&
     git commit -m "Added attic_gremlin" &&
        git cvsexportcommit -w "$CVSWORK" -c HEAD &&
     git add attic_gremlin &&
     git commit -m "Added attic_gremlin" &&
        git cvsexportcommit -w "$CVSWORK" -c HEAD &&

-    (cd "$CVSWORK"; cvs -Q update -d) &&
+    (cd "$CVSWORK" && cvs -Q update -d) &&

     test -f "$CVSWORK/attic_gremlin"
 '
 
     test -f "$CVSWORK/attic_gremlin"
 '
 

diff --git a/t/t9302-fast-import-unpack-limit.sh b/t/t9302-fast-import-unpack-limit.sh
index a04de14677adee98bef418f17c6421eda17a358f..bb1c39cfcc9626dd1de998c50f9126b4a88ccc06 100755 (executable)
--- a/t/t9302-fast-import-unpack-limit.sh
+++ b/t/t9302-fast-import-unpack-limit.sh
@@ -80,7 +80,7 @@ test_expect_success 'lookups after checkpoint works' '
                do
                        if test $n -gt 30
                        then
                do
                        if test $n -gt 30
                        then

-                               echo >&2 "checkpoint did not update branch"
+                               echo >&2 "checkpoint did not update branch" &&

                                exit 1
                        else
                                n=$(($n + 1))
                                exit 1
                        else
                                n=$(($n + 1))

diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index 6b09da79bf3b1d0cb4cd8c02a8bb99cb1171427e..a5e5dca75341561894d681410aaeec6e365144fc 100755 (executable)
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -371,7 +371,7 @@ test_expect_success 'cvs update (merge)' \
   'echo Line 0 >expected &&
    for i in 1 2 3 4 5 6 7
    do
   'echo Line 0 >expected &&
    for i in 1 2 3 4 5 6 7
    do

-     echo Line $i >>merge
+     echo Line $i >>merge &&

      echo Line $i >>expected
    done &&
    echo Line 8 >>expected &&
      echo Line $i >>expected
    done &&
    echo Line 8 >>expected &&


@@ -382,7 +382,7 @@ test_expect_success 'cvs update (merge)' \
    GIT_CONFIG="$git_config" cvs -Q update &&
    test "$(echo $(grep merge CVS/Entries|cut -d/ -f2,3,5))" = "merge/1.1/" &&
    test_cmp merge ../merge &&
    GIT_CONFIG="$git_config" cvs -Q update &&
    test "$(echo $(grep merge CVS/Entries|cut -d/ -f2,3,5))" = "merge/1.1/" &&
    test_cmp merge ../merge &&

-   ( echo Line 0; cat merge ) >merge.tmp &&
+   ( echo Line 0 && cat merge ) >merge.tmp &&

    mv merge.tmp merge &&
    cd "$WORKDIR" &&
    echo Line 8 >>merge &&
    mv merge.tmp merge &&
    cd "$WORKDIR" &&
    echo Line 8 >>merge &&


@@ -410,7 +410,7 @@ do
 done
 
 test_expect_success 'cvs update (conflict merge)' \
 done
 
 test_expect_success 'cvs update (conflict merge)' \

-  '( echo LINE 0; cat merge ) >merge.tmp &&
+  '( echo LINE 0 && cat merge ) >merge.tmp &&

    mv merge.tmp merge &&
    git add merge &&
    git commit -q -m "Merge test (conflict)" &&
    mv merge.tmp merge &&
    git add merge &&
    git commit -q -m "Merge test (conflict)" &&

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 804ce3850ff3f7838035fd316e26ee301b525ff0..5dfee07d9add00d4a68e70c89c8711604f218ef1 100755 (executable)
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -135,7 +135,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
 
        (cd module-git &&
         git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
 
        (cd module-git &&
         git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&

-        git log --format="o_fortuna 1.2 %H" -1 HEAD^
+        git log --format="o_fortuna 1.2 %H" -1 HEAD^ &&

         git log --format="tick 1.1 %H" -1 HEAD) > expected &&
        test_cmp expected module-git/.git/cvs-revisions
 '
         git log --format="tick 1.1 %H" -1 HEAD) > expected &&
        test_cmp expected module-git/.git/cvs-revisions
 '

diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 1ab76c4246f215cfc0082bdbfd090e1622362140..3f5291b85752e7bc78901da18c2bfa654134eb59 100755 (executable)
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -134,7 +134,7 @@ test_expect_success 'clone --changesfile' '
        (
                cd "$git" &&
                git log --oneline p4/master >lines &&
        (
                cd "$git" &&
                git log --oneline p4/master >lines &&

-               test_line_count = 2 lines
+               test_line_count = 2 lines &&

                test_path_is_file file1 &&
                test_path_is_missing file2 &&
                test_path_is_file file3
                test_path_is_file file1 &&
                test_path_is_missing file2 &&
                test_path_is_file file3

diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh
index 8134ab439b2eb91a3a315cab92b12a2b8b3e5a00..cc53debe1955ece317f994b0e76f2b8470b0f4f6 100755 (executable)
--- a/t/t9810-git-p4-rcs.sh
+++ b/t/t9810-git-p4-rcs.sh
@@ -161,7 +161,7 @@ test_expect_success 'cleanup after failure' '
 test_expect_success 'ktext expansion should not expand multi-line $File::' '
        (
                cd "$cli" &&
 test_expect_success 'ktext expansion should not expand multi-line $File::' '
        (
                cd "$cli" &&

-               cat >lv.pm <<-\EOF
+               cat >lv.pm <<-\EOF &&

                my $wanted = sub { my $f = $File::Find::name;
                                    if ( -f && $f =~ /foo/ ) {
                EOF
                my $wanted = sub { my $f = $File::Find::name;
                                    if ( -f && $f =~ /foo/ ) {
                EOF

diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh
index decb66ba30871573eb9c252e56599d47095f0fff..602b0a5d5ceafcac6439491b463fee7867e7036f 100755 (executable)
--- a/t/t9811-git-p4-label-import.sh
+++ b/t/t9811-git-p4-label-import.sh
@@ -133,7 +133,7 @@ test_expect_success 'export git tags to p4' '
                p4 labels ... | grep LIGHTWEIGHT_TAG &&
                p4 label -o GIT_TAG_1 | grep "tag created in git:xyzzy" &&
                p4 sync ...@GIT_TAG_1 &&
                p4 labels ... | grep LIGHTWEIGHT_TAG &&
                p4 label -o GIT_TAG_1 | grep "tag created in git:xyzzy" &&
                p4 sync ...@GIT_TAG_1 &&

-               ! test -f main/f10
+               ! test -f main/f10 &&

                p4 sync ...@GIT_TAG_2 &&
                test -f main/f10
        )
                p4 sync ...@GIT_TAG_2 &&
                test -f main/f10
        )

diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh
index 37b42d03a2b4f6392c3b84303c52a839caa6befd..eaf03a656329c7b4b9d0ed40c839232a81b310ac 100755 (executable)
--- a/t/t9815-git-p4-submit-fail.sh
+++ b/t/t9815-git-p4-submit-fail.sh
@@ -394,7 +394,7 @@ test_expect_success 'cleanup rename after submit cancel' '
        (
                cd "$cli" &&
                test_path_is_missing text2 &&
        (
                cd "$cli" &&
                test_path_is_missing text2 &&

-               p4 fstat -T action text2 2>&1 | grep "no such file"
+               p4 fstat -T action text2 2>&1 | grep "no such file" &&

                test_path_is_file text &&
                ! p4 fstat -T action text
        )
                test_path_is_file text &&
                ! p4 fstat -T action text
        )

diff --git a/t/t9830-git-p4-symlink-dir.sh b/t/t9830-git-p4-symlink-dir.sh
index 3dc528bb1e0b90c17739b2702afcb8903f8cda10..2ad1b0810df81ecaf5197e4cf860b3524d557c09 100755 (executable)
--- a/t/t9830-git-p4-symlink-dir.sh
+++ b/t/t9830-git-p4-symlink-dir.sh
@@ -30,7 +30,7 @@ test_expect_success 'symlinked directory' '
        (
                cd "$cli" &&
                p4 sync &&
        (
                cd "$cli" &&
                p4 sync &&

-               test -L some/sub/directory/subdir2
+               test -L some/sub/directory/subdir2 &&

                test_path_is_file some/sub/directory/subdir2/file.t
        )
 
                test_path_is_file some/sub/directory/subdir2/file.t
        )
 

diff --git a/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh
index bbcf14c6646cb4cd9c01d009d196d63a4986a96c..be44c9751aefa5368d6f05d7b1c29f0c8354095f 100755 (executable)
--- a/t/t9831-git-p4-triggers.sh
+++ b/t/t9831-git-p4-triggers.sh
@@ -13,7 +13,7 @@ test_expect_success 'init depot' '
                cd "$cli" &&
                echo file1 >file1 &&
                p4 add file1 &&
                cd "$cli" &&
                echo file1 >file1 &&
                p4 add file1 &&

-               p4 submit -d "change 1"
+               p4 submit -d "change 1" &&

                echo file2 >file2 &&
                p4 add file2 &&
                p4 submit -d "change 2"
                echo file2 >file2 &&
                p4 add file2 &&
                p4 submit -d "change 2"

diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 3b3a7b66e41024b5a9b939f1c33a9996b8874a12..5ff43b9cbbe1693ac23ac7f020522d16424cb936 100755 (executable)
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -1103,7 +1103,7 @@ test_expect_success '__git_complete_refs - remote' '
        master-in-other Z
        EOF
        (
        master-in-other Z
        EOF
        (

-               cur=
+               cur= &&

                __git_complete_refs --remote=other &&
                print_comp
        ) &&
                __git_complete_refs --remote=other &&
                print_comp
        ) &&


@@ -1122,7 +1122,7 @@ test_expect_success '__git_complete_refs - track' '
        master-in-other Z
        EOF
        (
        master-in-other Z
        EOF
        (

-               cur=
+               cur= &&

                __git_complete_refs --track &&
                print_comp
        ) &&
                __git_complete_refs --track &&
                print_comp
        ) &&

diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index c3b89ae783d0b5511718be6d6b9d9978dd9131cd..04440685a66d6baff98c1739979c8f866255572b 100755 (executable)
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -529,7 +529,7 @@ test_expect_success 'prompt - bash color pc mode - branch name' '
        printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear}):AFTER\\nmaster" >expected &&
        (
                GIT_PS1_SHOWCOLORHINTS=y &&
        printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear}):AFTER\\nmaster" >expected &&
        (
                GIT_PS1_SHOWCOLORHINTS=y &&

-               __git_ps1 "BEFORE:" ":AFTER" >"$actual"
+               __git_ps1 "BEFORE:" ":AFTER" >"$actual" &&

                printf "%s\\n%s" "$PS1" "${__git_ps1_branch_name}" >"$actual"
        ) &&
        test_cmp expected "$actual"
                printf "%s\\n%s" "$PS1" "${__git_ps1_branch_name}" >"$actual"
        ) &&
        test_cmp expected "$actual"