зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
9b966fffc2
Коммит
64d1022e14
|
@ -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
|
||||
'
|
||||
|
|
|
@ -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
|
||||
'
|
||||
|
|
|
@ -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
|
||||
'
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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" &&
|
||||
|
|
|
@ -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 &&
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 &&
|
||||
(
|
||||
|
|
|
@ -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 &&
|
||||
|
|
|
@ -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 &&
|
||||
|
|
|
@ -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 &&
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -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:
|
||||
|
|
Загрузка…
Ссылка в новой задаче