@@ -11,19 +11,19 @@ tags, branches and other git refspecs'
1111
1212check_start_tree () {
1313 rm -f " $WORKDIR /check.list"
14- echo " start $1 " >> " ${WORKDIR} /check.log"
14+ echo " start $1 " >> " ${WORKDIR} /check.log"
1515}
1616
1717check_file () {
1818 sandbox=" $1 "
1919 file=" $2 "
2020 ver=" $3 "
2121 GIT_DIR=$SERVERDIR git show " ${ver} :${file} " \
22- > " $WORKDIR /check.got" 2> " $WORKDIR /check.stderr"
22+ > " $WORKDIR /check.got" 2> " $WORKDIR /check.stderr"
2323 test_cmp " $WORKDIR /check.got" " $sandbox /$file "
2424 stat=$?
25- echo " check_file $sandbox $file $ver : $stat " >> " $WORKDIR /check.log"
26- echo " $file " >> " $WORKDIR /check.list"
25+ echo " check_file $sandbox $file $ver : $stat " >> " $WORKDIR /check.log"
26+ echo " $file " >> " $WORKDIR /check.list"
2727 return $stat
2828}
2929
@@ -57,7 +57,7 @@ check_diff() {
5757 ( cd diffSandbox &&
5858 git checkout " $vOld " &&
5959 git apply -p0 --index < " ../$diffFile " &&
60- git diff --exit-code " $vNew " ) > check_diff_apply.out 2>&1
60+ git diff --exit-code " $vNew " ) > check_diff_apply.out 2>&1
6161}
6262
6363# ########
@@ -89,18 +89,18 @@ export CVSROOT CVS_SERVER
8989
9090rm -rf " $CVSWORK " " $SERVERDIR "
9191test_expect_success ' setup v1, b1' '
92- echo "Simple text file" > textfile.c &&
93- echo "t2" > t2 &&
92+ echo "Simple text file" >textfile.c &&
93+ echo "t2" >t2 &&
9494 mkdir adir &&
95- echo "adir/afile line1" > adir/afile &&
96- echo "adir/afile line2" >> adir/afile &&
97- echo "adir/afile line3" >> adir/afile &&
98- echo "adir/afile line4" >> adir/afile &&
99- echo "adir/a2file" >> adir/a2file &&
95+ echo "adir/afile line1" >adir/afile &&
96+ echo "adir/afile line2" >>adir/afile &&
97+ echo "adir/afile line3" >>adir/afile &&
98+ echo "adir/afile line4" >>adir/afile &&
99+ echo "adir/a2file" >>adir/a2file &&
100100 mkdir adir/bdir &&
101- echo "adir/bdir/bfile line 1" > adir/bdir/bfile &&
102- echo "adir/bdir/bfile line 2" >> adir/bdir/bfile &&
103- echo "adir/bdir/b2file" > adir/bdir/b2file &&
101+ echo "adir/bdir/bfile line 1" >adir/bdir/bfile &&
102+ echo "adir/bdir/bfile line 2" >>adir/bdir/bfile &&
103+ echo "adir/bdir/b2file" >adir/bdir/b2file &&
104104 git add textfile.c t2 adir &&
105105 git commit -q -m "First Commit (v1)" &&
106106 git tag v1 &&
@@ -152,7 +152,7 @@ test_expect_success 'edit cvswork3 and save diff' '
152152 ( cd cvswork3 &&
153153 sed -e "s/line1/line1 - data/" adir/afile >adir/afileNEW &&
154154 mv -f adir/afileNEW adir/afile &&
155- echo "afile5" > adir/afile5 &&
155+ echo "afile5" >adir/afile5 &&
156156 rm t2 &&
157157 cvs -f add adir/afile5 &&
158158 cvs -f rm t2 &&
@@ -162,17 +162,17 @@ test_expect_success 'edit cvswork3 and save diff' '
162162
163163test_expect_success ' setup v1.2 on b1' '
164164 git checkout b1 &&
165- echo "new v1.2" > t3 &&
165+ echo "new v1.2" >t3 &&
166166 rm t2 &&
167167 sed -e "s/line3/line3 - more data/" adir/afile >adir/afileNEW &&
168168 mv -f adir/afileNEW adir/afile &&
169169 rm adir/a2file &&
170- echo "a3file" >> adir/a3file &&
171- echo "bfile line 3" >> adir/bdir/bfile &&
170+ echo "a3file" >>adir/a3file &&
171+ echo "bfile line 3" >>adir/bdir/bfile &&
172172 rm adir/bdir/b2file &&
173- echo "b3file" > adir/bdir/b3file &&
173+ echo "b3file" >adir/bdir/b3file &&
174174 mkdir cdir &&
175- echo "cdir/cfile" > cdir/cfile &&
175+ echo "cdir/cfile" >cdir/cfile &&
176176 git add -A cdir adir t3 t2 &&
177177 git commit -q -m ' v1.2' &&
178178 git tag v1.2 &&
@@ -280,7 +280,7 @@ test_expect_success 'cvs co b2 [into cvswork2]' '
280280
281281test_expect_success ' root dir edit [cvswork2]' '
282282 ( cd cvswork2 &&
283- echo "Line 2" >> textfile.c &&
283+ echo "Line 2" >>textfile.c &&
284284 ! cvs -f diff -u >"$WORKDIR/cvsEdit1.diff" &&
285285 cvs -f commit -m "edit textfile.c" textfile.c
286286 ) >cvsEdit1.log 2>&1
@@ -289,10 +289,10 @@ test_expect_success 'root dir edit [cvswork2]' '
289289test_expect_success ' root dir rm file [cvswork2]' '
290290 ( cd cvswork2 &&
291291 cvs -f rm -f t2 &&
292- cvs -f diff -u > ../cvsEdit2-empty.diff &&
292+ cvs -f diff -u >../cvsEdit2-empty.diff &&
293293 ! cvs -f diff -N -u >"$WORKDIR/cvsEdit2-N.diff" &&
294294 cvs -f commit -m "rm t2"
295- ) > cvsEdit2.log 2>&1
295+ ) >cvsEdit2.log 2>&1
296296'
297297
298298test_expect_success ' subdir edit/add/rm files [cvswork2' '
@@ -302,7 +302,7 @@ test_expect_success 'subdir edit/add/rm files [cvswork2' '
302302 rm adir/bdir/b2file &&
303303 cd adir &&
304304 cvs -f rm bdir/b2file &&
305- echo "4th file" > bdir/b4file &&
305+ echo "4th file" >bdir/b4file &&
306306 cvs -f add bdir/b4file &&
307307 ! cvs -f diff -N -u >"$WORKDIR/cvsEdit3.diff" &&
308308 git fetch gitcvs.git b2:b2 &&
@@ -471,15 +471,15 @@ test_expect_success 'cvs diff -N -r v2 -u' '
471471 ! cvs -f diff -N -r v2 -u ) >cvsDiff.out 2>cvs.log &&
472472 test ! -s cvs.log &&
473473 test -s cvsDiff.out &&
474- check_diff cvsDiff.out v2 v1 > check_diff.out 2>&1
474+ check_diff cvsDiff.out v2 v1 >check_diff.out 2>&1
475475'
476476
477477test_expect_success ' cvs diff -N -r v2 -r v1.2' '
478478 ( cd cvswork &&
479479 ! cvs -f diff -N -r v2 -r v1.2 -u ) >cvsDiff.out 2>cvs.log &&
480480 test ! -s cvs.log &&
481481 test -s cvsDiff.out &&
482- check_diff cvsDiff.out v2 v1.2 > check_diff.out 2>&1
482+ check_diff cvsDiff.out v2 v1.2 >check_diff.out 2>&1
483483'
484484
485485test_expect_success ' apply early [cvswork3] diff to b3' '
@@ -499,7 +499,7 @@ test_expect_success 'check [cvswork3] diff' '
499499 test -s cvsDiff.out &&
500500 test $(grep Index: cvsDiff.out | wc -l) = 3 &&
501501 test_cmp cvsDiff.out cvswork3edit.diff &&
502- check_diff cvsDiff.out v1 v3 > check_diff.out 2>&1
502+ check_diff cvsDiff.out v1 v3 >check_diff.out 2>&1
503503'
504504
505505test_expect_success ' merge early [cvswork3] b3 with b1' '
@@ -537,7 +537,7 @@ test_expect_success 'cvs up dirty [cvswork3]' '
537537test_expect_success ' cvs commit [cvswork3' '
538538 ( cd cvswork3 &&
539539 cvs -f commit -m "dirty sandbox after auto-merge"
540- ) > cvs.log 2>&1 &&
540+ ) >cvs.log 2>&1 &&
541541 check_start_tree cvswork3 &&
542542 check_file cvswork3 textfile.c v3merged &&
543543 check_file cvswork3 t3 v3merged &&
@@ -550,7 +550,7 @@ test_expect_success 'cvs commit [cvswork3' '
550550 check_end_full_tree cvswork3 v3merged &&
551551 git fetch gitcvs.git b3:b4 &&
552552 git tag v4.1 b4 &&
553- git diff --exit-code v4.1 v3merged > check_diff_apply.out 2>&1
553+ git diff --exit-code v4.1 v3merged >check_diff_apply.out 2>&1
554554'
555555
556556test_done
0 commit comments