t: fix whitespace around &&

Add missing spaces before '&&' and switch tabs around '&&' to spaces.
Also fix the space after redirection operator in t3701 while we're here.

These issues were found using `git grep '[^ ]&&$'` and
`git grep -P '&&\t' t/`.

Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
index 69ffe865b43965bb84bbe60402fc9c03ecc8ba9b..52585ec2aa8ba6d9104060361523c1b307bebfda 100755 (executable)
--- a/t/t2402-worktree-list.sh
+++ b/t/t2402-worktree-list.sh
@@ -152,7 +152,7 @@ test_expect_success 'linked worktrees are sorted' '
 '
 
 test_expect_success 'worktree path when called in .git directory' '
-       git worktree list >list1&&
+       git worktree list >list1 &&
        git -C .git worktree list >list2 &&
        test_cmp list1 list2
 '

diff --git a/t/t3417-rebase-whitespace-fix.sh b/t/t3417-rebase-whitespace-fix.sh
index e85cdc7037bcb6184d1ce6f9aa7ff2cfc4af2096..946e92f8dac84edcad260d4f7354b996e54b61ec 100755 (executable)
--- a/t/t3417-rebase-whitespace-fix.sh
+++ b/t/t3417-rebase-whitespace-fix.sh
@@ -52,7 +52,7 @@ test_expect_success 'blank line at end of file; extend at end of file' '
        git commit --allow-empty -m "Initial empty commit" &&
        git add file && git commit -m first &&
        mv second file &&
-       git add file && git commit -m second &&
+       git add file && git commit -m second &&
        git rebase --whitespace=fix HEAD^^ &&
        git diff --exit-code HEAD^:file expect-first &&
        test_cmp expect-second file
@@ -118,7 +118,7 @@ test_expect_success 'at beginning of file' '
        for i in 1 2 3 4 5; do
                echo $i
        done >> file &&
-       git commit -m more file &&
+       git commit -m more file &&
        git rebase --whitespace=fix HEAD^^ &&
        test_cmp expect-beginning file
 '

diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 88bc799807f7dd99ba98cda2b698ef83e027f7b7..b7d4ba608cbc96998fdac714ebb53a0f53c46f9e 100755 (executable)
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -192,7 +192,7 @@ test_expect_success 'git add --refresh with pathspec' '
        test_must_be_empty actual &&
 
        git diff-files --name-only >actual &&
-       ! grep bar actual&&
+       ! grep bar actual &&
        grep baz actual
 '
 

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 5bae6e50f1f3e76c1615bf5e3031e99f92d619b9..b3d8bb7577661c0211bc349900cc321f9971ff05 100755 (executable)
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -780,7 +780,7 @@ test_expect_success 'add -p patch editing works with pathological context lines'
 test_expect_success 'checkout -p works with pathological context lines' '
        test_write_lines a a a a a a >a &&
        git add a &&
-       test_write_lines a b a b a b a b a b a > a&&
+       test_write_lines a b a b a b a b a b a >a &&
        test_write_lines s n n y q | git checkout -p &&
        test_write_lines a b a b a a b a b a >expect &&
        test_cmp expect a

diff --git a/t/t4057-diff-combined-paths.sh b/t/t4057-diff-combined-paths.sh
index 4f4b541658a1b604ee27aff76a4e2047fca8111c..0b78573733b30716d1ed4fb8bd2fdeee0c5b9d83 100755 (executable)
--- a/t/t4057-diff-combined-paths.sh
+++ b/t/t4057-diff-combined-paths.sh
@@ -14,7 +14,7 @@ diffc_verify () {
 test_expect_success 'trivial merge - combine-diff empty' '
        for i in $(test_seq 1 9)
        do
-               echo $i >$i.txt &&
+               echo $i >$i.txt &&
                git add $i.txt
        done &&
        git commit -m "init" &&

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index cb45271457266daf4d809362cb846dc0f879dd48..bda4586a7951a234b50ffbb28cdd4d7df05e4c56 100755 (executable)
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -166,7 +166,7 @@ test_expect_success setup '
        test_tick &&
        git commit -m third &&
 
-       git format-patch --stdout first >patch2 &&
+       git format-patch --stdout first >patch2 &&
 
        git checkout -b lorem &&
        sed -n -e "11,\$p" msg >file &&

diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index 4f681dbbe11c7f37d47d30bfa33a215c0dd9e189..b57209c84fcad43ce728dd8bfa24674caa64c37c 100755 (executable)
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -131,7 +131,7 @@ test_expect_success 'fetch that requires changes in .git/shallow is filtered' '
        git init notshallow &&
        (
        cd notshallow &&
-       git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/*&&
+       git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
        git for-each-ref --format="%(refname)" >actual.refs &&
        cat <<EOF >expect.refs &&
 refs/remotes/shallow/no-shallow

diff --git a/t/t5604-clone-reference.sh b/t/t5604-clone-reference.sh
index 0c74b4e21a3ef17499401cdd1f4eeaab5c392137..2f7be23044712ae832428fac09ad0a3cfd6a1fff 100755 (executable)
--- a/t/t5604-clone-reference.sh
+++ b/t/t5604-clone-reference.sh
@@ -175,7 +175,7 @@ test_expect_success 'clone using repo pointed at by gitfile as reference' '
 test_expect_success 'clone and dissociate from reference' '
        git init P &&
        (
-               cd P && test_commit one
+               cd P && test_commit one
        ) &&
        git clone P Q &&
        (

diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index e3e2aab3b0a106a5a137361c3f1765515c1b1931..956e17abb3d7d5fb480c84c977067837c6baca61 100755 (executable)
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -938,7 +938,7 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano
                echo "repo" >expect &&
                test_must_fail git config -f .gitmodules submodule.repo.path &&
                git config -f .gitmodules submodule.repo_new.path >actual &&
-               test_cmp expect actual&&
+               test_cmp expect actual &&
                echo "$submodurl/repo" >expect &&
                test_must_fail git config -f .gitmodules submodule.repo.url &&
                echo "$submodurl/bare.git" >expect &&
@@ -1010,7 +1010,7 @@ test_expect_success 'submodule add with an existing name fails unless forced' '
                test -d repo &&
                echo "repo" >expect &&
                git config -f .gitmodules submodule.repo_new.path >actual &&
-               test_cmp expect actual&&
+               test_cmp expect actual &&
                echo "$submodurl/repo.git" >expect &&
                git config -f .gitmodules submodule.repo_new.url >actual &&
                test_cmp expect actual &&

diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh
index e90413204ee32cafc3380244a5cf013eadcd72c1..5c8894d94ff107b6ea9ca63226075fadf9501e55 100755 (executable)
--- a/t/t7609-merge-co-error-msgs.sh
+++ b/t/t7609-merge-co-error-msgs.sh
@@ -126,7 +126,7 @@ test_expect_success 'not_uptodate_dir porcelain checkout error' '
        git rm rep2 -r &&
        >rep &&
        >rep2 &&
-       git add rep rep2&&
+       git add rep rep2 &&
        git commit -m "added test as a file" &&
        git checkout master &&
        >rep/untracked-file &&

diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index c90fdc5c8940164c6bf0eacdf9f7ac2e3b0e02ec..83f8f5cacb59658bab98fde2da87f6cb5f7a9fca 100755 (executable)
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -486,7 +486,7 @@ test_expect_success 'NUL in property value' '
        {
                properties \
                        unimportant "something with a NUL (Q)" \
-                       svn:log "commit message"&&
+                       svn:log "commit message" &&
                echo PROPS-END
        } |
        q_to_nul >props &&

diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 784df808588faa27f98bd6fc1f2d1c98e59e4814..267ddc997d028926a81562fe6fe8eab9157da819 100755 (executable)
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -348,7 +348,7 @@ test_expect_success \
         echo "To be renamed and changed" >04-rename-from &&
         echo "To have mode changed" >05-mode-change &&
         echo "File to symlink" >06-file-or-symlink &&
-        echo "To be changed and have mode changed" >07-change-mode-change      &&
+        echo "To be changed and have mode changed" >07-change-mode-change &&
         git add 0* &&
         git commit -a -m "Prepare large commit" &&
         echo "Changed" >01-change &&
@@ -361,7 +361,7 @@ test_expect_success \
         test_chmod +x 05-mode-change &&
         rm -f 06-file-or-symlink &&
         test_ln_s_add 01-change 06-file-or-symlink &&
-        echo "Changed and have mode changed" >07-change-mode-change    &&
+        echo "Changed and have mode changed" >07-change-mode-change &&
         test_chmod +x 07-change-mode-change &&
         git commit -a -m "Large commit" &&
         git checkout master'

diff --git a/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh
index d743ca33ee6ab29f97d328756663803824f105f5..ff6c0352e688246e9b97e063679889c2583c459e 100755 (executable)
--- a/t/t9831-git-p4-triggers.sh
+++ b/t/t9831-git-p4-triggers.sh
@@ -58,7 +58,7 @@ test_expect_success 'import with extra info lines from verbose p4 trigger' '
        (
                cd "$git" &&
                git p4 sync
-       )&&
+       ) &&
        (
                p4 triggers -i <<-EOF
                Triggers: