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>
Andrei Rybak committed
Mar 22, 2020 at 22:14 UTC
64d1022e14cafa211f84aab9e1a9f7aab8164855
13 files changed
+16
-16
t/t2402-worktree-list.sh
+1
-1
@@ -152,7 +152,7 @@ test_expect_success 'linked worktrees are sorted' '
152
'
153
154
test_expect_success 'worktree path when called in .git directory' '
155
- git worktree list >list1&&
155
+ git worktree list >list1 &&
156
git -C .git worktree list >list2 &&
157
test_cmp list1 list2
158
'
t/t3417-rebase-whitespace-fix.sh
+2
-2
@@ -52,7 +52,7 @@ test_expect_success 'blank line at end of file; extend at end of file' '
52
git commit --allow-empty -m "Initial empty commit" &&
53
git add file && git commit -m first &&
54
mv second file &&
55
- git add file && git commit -m second &&
55
+ git add file && git commit -m second &&
56
git rebase --whitespace=fix HEAD^^ &&
57
git diff --exit-code HEAD^:file expect-first &&
58
test_cmp expect-second file
@@ -118,7 +118,7 @@ test_expect_success 'at beginning of file' '
118
for i in 1 2 3 4 5; do
119
echo $i
120
done >> file &&
121
- git commit -m more file &&
121
+ git commit -m more file &&
122
git rebase --whitespace=fix HEAD^^ &&
123
test_cmp expect-beginning file
124
'
t/t3700-add.sh
+1
-1
@@ -192,7 +192,7 @@ test_expect_success 'git add --refresh with pathspec' '
192
test_must_be_empty actual &&
193
194
git diff-files --name-only >actual &&
195
- ! grep bar actual&&
195
+ ! grep bar actual &&
196
grep baz actual
197
'
198
t/t3701-add-interactive.sh
+1
-1
@@ -780,7 +780,7 @@ test_expect_success 'add -p patch editing works with pathological context lines'
780
test_expect_success 'checkout -p works with pathological context lines' '
781
test_write_lines a a a a a a >a &&
782
git add a &&
783
- test_write_lines a b a b a b a b a b a > a&&
783
+ test_write_lines a b a b a b a b a b a >a &&
784
test_write_lines s n n y q | git checkout -p &&
785
test_write_lines a b a b a a b a b a >expect &&
786
test_cmp expect a
t/t4057-diff-combined-paths.sh
+1
-1
@@ -14,7 +14,7 @@ diffc_verify () {
14
test_expect_success 'trivial merge - combine-diff empty' '
15
for i in $(test_seq 1 9)
16
do
17
- echo $i >$i.txt &&
17
+ echo $i >$i.txt &&
18
git add $i.txt
19
done &&
20
git commit -m "init" &&
t/t4150-am.sh
+1
-1
@@ -166,7 +166,7 @@ test_expect_success setup '
166
test_tick &&
167
git commit -m third &&
168
169
- git format-patch --stdout first >patch2 &&
169
+ git format-patch --stdout first >patch2 &&
170
171
git checkout -b lorem &&
172
sed -n -e "11,\$p" msg >file &&
t/t5537-fetch-shallow.sh
+1
-1
@@ -131,7 +131,7 @@ test_expect_success 'fetch that requires changes in .git/shallow is filtered' '
131
git init notshallow &&
132
(
133
cd notshallow &&
134
- git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/*&&
134
+ git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
135
git for-each-ref --format="%(refname)" >actual.refs &&
136
cat <<EOF >expect.refs &&
137
refs/remotes/shallow/no-shallow
t/t5604-clone-reference.sh
+1
-1
@@ -175,7 +175,7 @@ test_expect_success 'clone using repo pointed at by gitfile as reference' '
175
test_expect_success 'clone and dissociate from reference' '
176
git init P &&
177
(
178
- cd P && test_commit one
178
+ cd P && test_commit one
179
) &&
180
git clone P Q &&
181
(
t/t7400-submodule-basic.sh
+2
-2
@@ -938,7 +938,7 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano
938
echo "repo" >expect &&
939
test_must_fail git config -f .gitmodules submodule.repo.path &&
940
git config -f .gitmodules submodule.repo_new.path >actual &&
941
- test_cmp expect actual&&
941
+ test_cmp expect actual &&
942
echo "$submodurl/repo" >expect &&
943
test_must_fail git config -f .gitmodules submodule.repo.url &&
944
echo "$submodurl/bare.git" >expect &&
@@ -1010,7 +1010,7 @@ test_expect_success 'submodule add with an existing name fails unless forced' '
1010
test -d repo &&
1011
echo "repo" >expect &&
1012
git config -f .gitmodules submodule.repo_new.path >actual &&
1013
- test_cmp expect actual&&
1013
+ test_cmp expect actual &&
1014
echo "$submodurl/repo.git" >expect &&
1015
git config -f .gitmodules submodule.repo_new.url >actual &&
1016
test_cmp expect actual &&
t/t7609-merge-co-error-msgs.sh
+1
-1
@@ -126,7 +126,7 @@ test_expect_success 'not_uptodate_dir porcelain checkout error' '
126
git rm rep2 -r &&
127
>rep &&
128
>rep2 &&
129
- git add rep rep2&&
129
+ git add rep rep2 &&
130
git commit -m "added test as a file" &&
131
git checkout master &&
132
>rep/untracked-file &&
t/t9010-svn-fe.sh
+1
-1
@@ -486,7 +486,7 @@ test_expect_success 'NUL in property value' '
486
{
487
properties \
488
unimportant "something with a NUL (Q)" \
489
- svn:log "commit message"&&
489
+ svn:log "commit message" &&
490
echo PROPS-END
491
} |
492
q_to_nul >props &&
t/t9500-gitweb-standalone-no-errors.sh
+2
-2
@@ -348,7 +348,7 @@ test_expect_success \
348
echo "To be renamed and changed" >04-rename-from &&
349
echo "To have mode changed" >05-mode-change &&
350
echo "File to symlink" >06-file-or-symlink &&
351
- echo "To be changed and have mode changed" >07-change-mode-change &&
351
+ echo "To be changed and have mode changed" >07-change-mode-change &&
352
git add 0* &&
353
git commit -a -m "Prepare large commit" &&
354
echo "Changed" >01-change &&
@@ -361,7 +361,7 @@ test_expect_success \
361
test_chmod +x 05-mode-change &&
362
rm -f 06-file-or-symlink &&
363
test_ln_s_add 01-change 06-file-or-symlink &&
364
- echo "Changed and have mode changed" >07-change-mode-change &&
364
+ echo "Changed and have mode changed" >07-change-mode-change &&
365
test_chmod +x 07-change-mode-change &&
366
git commit -a -m "Large commit" &&
367
git checkout master'
t/t9831-git-p4-triggers.sh
+1
-1
@@ -58,7 +58,7 @@ test_expect_success 'import with extra info lines from verbose p4 trigger' '
58
(
59
cd "$git" &&
60
git p4 sync
61
- )&&
61
+ ) &&
62
(
63
p4 triggers -i <<-EOF
64
Triggers: