mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
t: fix whitespace around &&
Add missing spaces before '&&' and switch tabs around '&&' to spaces. These issues were found using `git grep '[^ ]&&$'` and `git grep -P '&&\t'`. Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
ebf3c04b26
commit
52ff891c03
|
@ -86,7 +86,7 @@ test_expect_success 'Git clone works with page added' '
|
||||||
test_expect_success 'Git clone works with an edited page ' '
|
test_expect_success 'Git clone works with an edited page ' '
|
||||||
wiki_reset &&
|
wiki_reset &&
|
||||||
wiki_editpage foo "this page will be edited" \
|
wiki_editpage foo "this page will be edited" \
|
||||||
false -s "first edition of page foo"&&
|
false -s "first edition of page foo" &&
|
||||||
wiki_editpage foo "this page has been edited and must be on the clone " true &&
|
wiki_editpage foo "this page has been edited and must be on the clone " true &&
|
||||||
git clone mediawiki::'"$WIKI_URL"' mw_dir_6 &&
|
git clone mediawiki::'"$WIKI_URL"' mw_dir_6 &&
|
||||||
test_path_is_file mw_dir_6/Foo.mw &&
|
test_path_is_file mw_dir_6/Foo.mw &&
|
||||||
|
|
|
@ -287,7 +287,7 @@ test_expect_success 'git push with \' '
|
||||||
git add \\ko\\o.mw &&
|
git add \\ko\\o.mw &&
|
||||||
git commit -m " \\ko\\o added" &&
|
git commit -m " \\ko\\o added" &&
|
||||||
git push
|
git push
|
||||||
)&&
|
) &&
|
||||||
wiki_page_exist \\ko\\o &&
|
wiki_page_exist \\ko\\o &&
|
||||||
wiki_check_content mw_dir_18/\\ko\\o.mw \\ko\\o
|
wiki_check_content mw_dir_18/\\ko\\o.mw \\ko\\o
|
||||||
|
|
||||||
|
@ -311,7 +311,7 @@ test_expect_success 'git push with \ in format control' '
|
||||||
git add \\fo\\o.mw &&
|
git add \\fo\\o.mw &&
|
||||||
git commit -m " \\fo\\o added" &&
|
git commit -m " \\fo\\o added" &&
|
||||||
git push
|
git push
|
||||||
)&&
|
) &&
|
||||||
wiki_page_exist \\fo\\o &&
|
wiki_page_exist \\fo\\o &&
|
||||||
wiki_check_content mw_dir_20/\\fo\\o.mw \\fo\\o
|
wiki_check_content mw_dir_20/\\fo\\o.mw \\fo\\o
|
||||||
|
|
||||||
|
|
|
@ -268,7 +268,7 @@ test_expect_success 'diff with renames' '
|
||||||
for branch in rename-out-to-out rename-out-to-in rename-in-to-out
|
for branch in rename-out-to-out rename-out-to-in rename-in-to-out
|
||||||
do
|
do
|
||||||
test_all_match git checkout rename-base &&
|
test_all_match git checkout rename-base &&
|
||||||
test_all_match git checkout $branch -- .&&
|
test_all_match git checkout $branch -- . &&
|
||||||
test_all_match git diff --staged --no-renames &&
|
test_all_match git diff --staged --no-renames &&
|
||||||
test_all_match git diff --staged --find-renames || return 1
|
test_all_match git diff --staged --find-renames || return 1
|
||||||
done
|
done
|
||||||
|
|
|
@ -64,7 +64,7 @@ test_crlf_subject_body_and_contents() {
|
||||||
while test -n "${atoms}"
|
while test -n "${atoms}"
|
||||||
do
|
do
|
||||||
set ${atoms} && atom=$1 && shift && atoms="$*" &&
|
set ${atoms} && atom=$1 && shift && atoms="$*" &&
|
||||||
set ${files} && file=$1 && shift && files="$*" &&
|
set ${files} && file=$1 && shift && files="$*" &&
|
||||||
test_expect_success "${command}: --format='%${atom}' works with messages using CRLF" "
|
test_expect_success "${command}: --format='%${atom}' works with messages using CRLF" "
|
||||||
rm -f expect &&
|
rm -f expect &&
|
||||||
for ref in ${LIB_CRLF_BRANCHES}
|
for ref in ${LIB_CRLF_BRANCHES}
|
||||||
|
|
|
@ -959,7 +959,7 @@ test_expect_success SYMLINKS 'symlinks not respected in-tree' '
|
||||||
test_when_finished "rm .mailmap" &&
|
test_when_finished "rm .mailmap" &&
|
||||||
ln -s map .mailmap &&
|
ln -s map .mailmap &&
|
||||||
git log -1 --format=%aE >actual &&
|
git log -1 --format=%aE >actual &&
|
||||||
echo "orig@example.com" >expect&&
|
echo "orig@example.com" >expect &&
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
|
|
@ -988,7 +988,7 @@ test_expect_success '%(describe) vs git describe' '
|
||||||
|
|
||||||
test_expect_success '%(describe:match=...) vs git describe --match ...' '
|
test_expect_success '%(describe:match=...) vs git describe --match ...' '
|
||||||
test_when_finished "git tag -d tag-match" &&
|
test_when_finished "git tag -d tag-match" &&
|
||||||
git tag -a -m tagged tag-match&&
|
git tag -a -m tagged tag-match &&
|
||||||
git describe --match "*-match" >expect &&
|
git describe --match "*-match" >expect &&
|
||||||
git log -1 --format="%(describe:match=*-match)" >actual &&
|
git log -1 --format="%(describe:match=*-match)" >actual &&
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
|
|
|
@ -770,7 +770,7 @@ test_expect_success 'difftool --rotate-to' '
|
||||||
echo 4 >4 &&
|
echo 4 >4 &&
|
||||||
git add 1 2 4 &&
|
git add 1 2 4 &&
|
||||||
git commit -a -m "124" &&
|
git commit -a -m "124" &&
|
||||||
git difftool --no-prompt --extcmd=cat --rotate-to="2" HEAD^ >output&&
|
git difftool --no-prompt --extcmd=cat --rotate-to="2" HEAD^ >output &&
|
||||||
cat >expect <<-\EOF &&
|
cat >expect <<-\EOF &&
|
||||||
2
|
2
|
||||||
4
|
4
|
||||||
|
|
Loading…
Reference in a new issue