Skip to content

Commit cff4243

Browse files
sunshinecogitster
sunshineco
authored and
gitster
committed
t9000-t9999: fix broken &&-chains
Signed-off-by: Eric Sunshine <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e974e06 commit cff4243

26 files changed

+51
-51
lines changed

‎t/t9001-send-email.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ test_expect_success $PREREQ 'Show all headers' '
330330

331331
test_expect_success $PREREQ 'Prompting works' '
332332
clean_fake_sendmail &&
333-
(echo "[email protected]"
333+
(echo "[email protected]" &&
334334
echo ""
335335
) | GIT_SEND_EMAIL_NOTTY=1 git send-email \
336336
--smtp-server="$(pwd)/fake.sendmail" \
@@ -470,8 +470,8 @@ test_expect_success $PREREQ 'Invalid In-Reply-To' '
470470

471471
test_expect_success $PREREQ 'Valid In-Reply-To when prompting' '
472472
clean_fake_sendmail &&
473-
(echo "From Example <[email protected]>"
474-
echo "To Example <[email protected]>"
473+
(echo "From Example <[email protected]>" &&
474+
echo "To Example <[email protected]>" &&
475475
echo ""
476476
) | GIT_SEND_EMAIL_NOTTY=1 git send-email \
477477
--smtp-server="$(pwd)/fake.sendmail" \

‎t/t9100-git-svn-basic.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ test_expect_success \
3131
(
3232
cd import &&
3333
echo foo >foo &&
34-
ln -s foo foo.link
34+
ln -s foo foo.link &&
3535
mkdir -p dir/a/b/c/d/e &&
3636
echo "deep dir" >dir/a/b/c/d/e/file &&
3737
mkdir bar &&

‎t/t9101-git-svn-props.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ test_expect_success 'test show-ignore' "
149149
svn_cmd up &&
150150
svn_cmd propset -R svn:ignore '
151151
no-such-file*
152-
' .
152+
' . &&
153153
svn_cmd commit -m 'propset svn:ignore'
154154
) &&
155155
git svn show-ignore > show-ignore.got &&

‎t/t9122-git-svn-author.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ test_expect_success 'setup svn repository' '
77
svn_cmd checkout "$svnrepo" work.svn &&
88
(
99
cd work.svn &&
10-
echo >file
11-
svn_cmd add file
10+
echo >file &&
11+
svn_cmd add file &&
1212
svn_cmd commit -m "first commit" file
1313
)
1414
'
@@ -17,7 +17,7 @@ test_expect_success 'interact with it via git svn' '
1717
mkdir work.git &&
1818
(
1919
cd work.git &&
20-
git svn init "$svnrepo"
20+
git svn init "$svnrepo" &&
2121
git svn fetch &&
2222
2323
echo modification >file &&

‎t/t9129-git-svn-i18n-commitencoding.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ do
5151
git add F &&
5252
git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
5353
E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
54-
test "z$E" = "z$H"
54+
test "z$E" = "z$H" &&
5555
compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
5656
)
5757
'

‎t/t9130-git-svn-authors-file.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test_expect_success 'start import with incomplete authors file' '
2525

2626
test_expect_success 'imported 2 revisions successfully' '
2727
(
28-
cd x
28+
cd x &&
2929
git rev-list refs/remotes/git-svn >actual &&
3030
test_line_count = 2 actual &&
3131
git rev-list -1 --pretty=raw refs/remotes/git-svn >actual &&
@@ -42,7 +42,7 @@ EOF
4242

4343
test_expect_success 'continues to import once authors have been added' '
4444
(
45-
cd x
45+
cd x &&
4646
git svn fetch --authors-file=../svn-authors &&
4747
git rev-list refs/remotes/git-svn >actual &&
4848
test_line_count = 4 actual &&

‎t/t9134-git-svn-ignore-paths.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ test_expect_success 'update git svn-cloned repo (option ignore)' '
8282
test_expect_success 'SVN-side change inside of ignored www' '
8383
(
8484
cd s &&
85-
echo zaq >> www/test_www.txt
85+
echo zaq >> www/test_www.txt &&
8686
svn_cmd commit -m "SVN-side change inside of www/test_www.txt" &&
8787
svn_cmd up &&
8888
svn_cmd log -v | fgrep "SVN-side change inside of www/test_www.txt"
@@ -114,8 +114,8 @@ test_expect_success 'update git svn-cloned repo (option ignore)' '
114114
test_expect_success 'SVN-side change in and out of ignored www' '
115115
(
116116
cd s &&
117-
echo cvf >> www/test_www.txt
118-
echo ygg >> qqq/test_qqq.txt
117+
echo cvf >> www/test_www.txt &&
118+
echo ygg >> qqq/test_qqq.txt &&
119119
svn_cmd commit -m "SVN-side change in and out of ignored www" &&
120120
svn_cmd up &&
121121
svn_cmd log -v | fgrep "SVN-side change in and out of ignored www"

‎t/t9137-git-svn-dcommit-clobber-series.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ test_description='git svn dcommit clobber series'
77
test_expect_success 'initialize repo' '
88
mkdir import &&
99
(cd import &&
10-
awk "BEGIN { for (i = 1; i < 64; i++) { print i } }" > file
10+
awk "BEGIN { for (i = 1; i < 64; i++) { print i } }" > file &&
1111
svn_cmd import -m "initial" . "$svnrepo"
1212
) &&
1313
git svn init "$svnrepo" &&

‎t/t9138-git-svn-authors-prog.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ test_expect_success 'import authors with prog and file' '
3838

3939
test_expect_success 'imported 6 revisions successfully' '
4040
(
41-
cd x
41+
cd x &&
4242
git rev-list refs/remotes/git-svn >actual &&
4343
test_line_count = 6 actual
4444
)
4545
'
4646

4747
test_expect_success 'authors-prog ran correctly' '
4848
(
49-
cd x
49+
cd x &&
5050
git rev-list -1 --pretty=raw refs/remotes/git-svn~1 >actual &&
5151
grep "^author ee-foo <ee-foo@example\.com> " actual &&
5252
git rev-list -1 --pretty=raw refs/remotes/git-svn~2 >actual &&
@@ -62,7 +62,7 @@ test_expect_success 'authors-prog ran correctly' '
6262

6363
test_expect_success 'authors-file overrode authors-prog' '
6464
(
65-
cd x
65+
cd x &&
6666
git rev-list -1 --pretty=raw refs/remotes/git-svn >actual &&
6767
grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> " actual
6868
)

‎t/t9146-git-svn-empty-dirs.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ test_expect_success 'empty directories exist' '
2121
do
2222
if ! test -d "$i"
2323
then
24-
echo >&2 "$i does not exist"
24+
echo >&2 "$i does not exist" &&
2525
exit 1
2626
fi
2727
done
@@ -38,7 +38,7 @@ test_expect_success 'option automkdirs set to false' '
3838
do
3939
if test -d "$i"
4040
then
41-
echo >&2 "$i exists"
41+
echo >&2 "$i exists" &&
4242
exit 1
4343
fi
4444
done
@@ -63,7 +63,7 @@ test_expect_success 'git svn mkdirs recreates empty directories' '
6363
do
6464
if ! test -d "$i"
6565
then
66-
echo >&2 "$i does not exist"
66+
echo >&2 "$i does not exist" &&
6767
exit 1
6868
fi
6969
done
@@ -79,21 +79,21 @@ test_expect_success 'git svn mkdirs -r works' '
7979
do
8080
if ! test -d "$i"
8181
then
82-
echo >&2 "$i does not exist"
82+
echo >&2 "$i does not exist" &&
8383
exit 1
8484
fi
85-
done
85+
done &&
8686
8787
if test -d "! !"
8888
then
89-
echo >&2 "$i should not exist"
89+
echo >&2 "$i should not exist" &&
9090
exit 1
91-
fi
91+
fi &&
9292
9393
git svn mkdirs -r8 &&
9494
if ! test -d "! !"
9595
then
96-
echo >&2 "$i not exist"
96+
echo >&2 "$i not exist" &&
9797
exit 1
9898
fi
9999
)
@@ -115,7 +115,7 @@ test_expect_success 'empty directories in trunk exist' '
115115
do
116116
if ! test -d "$i"
117117
then
118-
echo >&2 "$i does not exist"
118+
echo >&2 "$i does not exist" &&
119119
exit 1
120120
fi
121121
done
@@ -148,7 +148,7 @@ test_expect_success 'git svn gc-ed files work' '
148148
do
149149
if ! test -d "$i"
150150
then
151-
echo >&2 "$i does not exist"
151+
echo >&2 "$i does not exist" &&
152152
exit 1
153153
fi
154154
done

0 commit comments

Comments
 (0)