Skip to content

Commit 12d23f8

Browse files
committed
Merge branch 'ar/test-code-cleanup' into next
Test code clean-up. * ar/test-code-cleanup: t: fix whitespace around &&
2 parents c7fb4f9 + 52ff891 commit 12d23f8

7 files changed

+8
-8
lines changed

contrib/mw-to-git/t/t9360-mw-to-git-clone.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ test_expect_success 'Git clone works with page added' '
8686
test_expect_success 'Git clone works with an edited page ' '
8787
wiki_reset &&
8888
wiki_editpage foo "this page will be edited" \
89-
false -s "first edition of page foo"&&
89+
false -s "first edition of page foo" &&
9090
wiki_editpage foo "this page has been edited and must be on the clone " true &&
9191
git clone mediawiki::'"$WIKI_URL"' mw_dir_6 &&
9292
test_path_is_file mw_dir_6/Foo.mw &&

contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ test_expect_success 'git push with \' '
287287
git add \\ko\\o.mw &&
288288
git commit -m " \\ko\\o added" &&
289289
git push
290-
)&&
290+
) &&
291291
wiki_page_exist \\ko\\o &&
292292
wiki_check_content mw_dir_18/\\ko\\o.mw \\ko\\o
293293
@@ -311,7 +311,7 @@ test_expect_success 'git push with \ in format control' '
311311
git add \\fo\\o.mw &&
312312
git commit -m " \\fo\\o added" &&
313313
git push
314-
)&&
314+
) &&
315315
wiki_page_exist \\fo\\o &&
316316
wiki_check_content mw_dir_20/\\fo\\o.mw \\fo\\o
317317

t/t1092-sparse-checkout-compatibility.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ test_expect_success 'diff with renames' '
268268
for branch in rename-out-to-out rename-out-to-in rename-in-to-out
269269
do
270270
test_all_match git checkout rename-base &&
271-
test_all_match git checkout $branch -- .&&
271+
test_all_match git checkout $branch -- . &&
272272
test_all_match git diff --staged --no-renames &&
273273
test_all_match git diff --staged --find-renames || return 1
274274
done

t/t3920-crlf-messages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ test_crlf_subject_body_and_contents() {
6464
while test -n "${atoms}"
6565
do
6666
set ${atoms} && atom=$1 && shift && atoms="$*" &&
67-
set ${files} && file=$1 && shift && files="$*" &&
67+
set ${files} && file=$1 && shift && files="$*" &&
6868
test_expect_success "${command}: --format='%${atom}' works with messages using CRLF" "
6969
rm -f expect &&
7070
for ref in ${LIB_CRLF_BRANCHES}

t/t4203-mailmap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ test_expect_success SYMLINKS 'symlinks not respected in-tree' '
959959
test_when_finished "rm .mailmap" &&
960960
ln -s map .mailmap &&
961961
git log -1 --format=%aE >actual &&
962-
echo "[email protected]" >expect&&
962+
echo "[email protected]" >expect &&
963963
test_cmp expect actual
964964
'
965965

t/t4205-log-pretty-formats.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ test_expect_success '%(describe) vs git describe' '
988988

989989
test_expect_success '%(describe:match=...) vs git describe --match ...' '
990990
test_when_finished "git tag -d tag-match" &&
991-
git tag -a -m tagged tag-match&&
991+
git tag -a -m tagged tag-match &&
992992
git describe --match "*-match" >expect &&
993993
git log -1 --format="%(describe:match=*-match)" >actual &&
994994
test_cmp expect actual

t/t7800-difftool.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ test_expect_success 'difftool --rotate-to' '
770770
echo 4 >4 &&
771771
git add 1 2 4 &&
772772
git commit -a -m "124" &&
773-
git difftool --no-prompt --extcmd=cat --rotate-to="2" HEAD^ >output&&
773+
git difftool --no-prompt --extcmd=cat --rotate-to="2" HEAD^ >output &&
774774
cat >expect <<-\EOF &&
775775
2
776776
4

0 commit comments

Comments
 (0)