From 02779185d5b280488cd1eafb1cdbb35babee5efe Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Sun, 1 Jul 2018 20:23:44 -0400 Subject: t: drop unnecessary terminating semicolon in subshell Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- t/t9400-git-cvsserver-server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t9400-git-cvsserver-server.sh') diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh index 06742748e9..6b09da79bf 100755 --- a/t/t9400-git-cvsserver-server.sh +++ b/t/t9400-git-cvsserver-server.sh @@ -328,7 +328,7 @@ test_expect_success 'cvs update (subdirectories)' \ '(for dir in A A/B A/B/C A/D E; do mkdir $dir && echo "test file in $dir" >"$dir/file_in_$(echo $dir|sed -e "s#/# #g")" && - git add $dir; + git add $dir done) && git commit -q -m "deep sub directory structure" && git push gitcvs.git >/dev/null && -- cgit v1.2.3 From cff4243db9eec386c17222d545ec7dbf51768672 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Sun, 1 Jul 2018 20:24:04 -0400 Subject: t9000-t9999: fix broken &&-chains Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- t/t9400-git-cvsserver-server.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 't/t9400-git-cvsserver-server.sh') diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh index 6b09da79bf..a5e5dca753 100755 --- a/t/t9400-git-cvsserver-server.sh +++ b/t/t9400-git-cvsserver-server.sh @@ -371,7 +371,7 @@ test_expect_success 'cvs update (merge)' \ 'echo Line 0 >expected && for i in 1 2 3 4 5 6 7 do - echo Line $i >>merge + echo Line $i >>merge && echo Line $i >>expected done && echo Line 8 >>expected && @@ -382,7 +382,7 @@ test_expect_success 'cvs update (merge)' \ GIT_CONFIG="$git_config" cvs -Q update && test "$(echo $(grep merge CVS/Entries|cut -d/ -f2,3,5))" = "merge/1.1/" && test_cmp merge ../merge && - ( echo Line 0; cat merge ) >merge.tmp && + ( echo Line 0 && cat merge ) >merge.tmp && mv merge.tmp merge && cd "$WORKDIR" && echo Line 8 >>merge && @@ -410,7 +410,7 @@ do done test_expect_success 'cvs update (conflict merge)' \ - '( echo LINE 0; cat merge ) >merge.tmp && + '( echo LINE 0 && cat merge ) >merge.tmp && mv merge.tmp merge && git add merge && git commit -q -m "Merge test (conflict)" && -- cgit v1.2.3