@@ -11,19 +11,19 @@ tags, branches and other git refspecs'
11
11
12
12
check_start_tree () {
13
13
rm -f " $WORKDIR /check.list"
14
- echo " start $1 " >> " ${WORKDIR} /check.log"
14
+ echo " start $1 " >> " ${WORKDIR} /check.log"
15
15
}
16
16
17
17
check_file () {
18
18
sandbox=" $1 "
19
19
file=" $2 "
20
20
ver=" $3 "
21
21
GIT_DIR=$SERVERDIR git show " ${ver} :${file} " \
22
- > " $WORKDIR /check.got" 2> " $WORKDIR /check.stderr"
22
+ > " $WORKDIR /check.got" 2> " $WORKDIR /check.stderr"
23
23
test_cmp " $WORKDIR /check.got" " $sandbox /$file "
24
24
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"
27
27
return $stat
28
28
}
29
29
@@ -57,7 +57,7 @@ check_diff() {
57
57
( cd diffSandbox &&
58
58
git checkout " $vOld " &&
59
59
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
61
61
}
62
62
63
63
# ########
@@ -89,18 +89,18 @@ export CVSROOT CVS_SERVER
89
89
90
90
rm -rf " $CVSWORK " " $SERVERDIR "
91
91
test_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 &&
94
94
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 &&
100
100
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 &&
104
104
git add textfile.c t2 adir &&
105
105
git commit -q -m "First Commit (v1)" &&
106
106
git tag v1 &&
@@ -152,7 +152,7 @@ test_expect_success 'edit cvswork3 and save diff' '
152
152
( cd cvswork3 &&
153
153
sed -e "s/line1/line1 - data/" adir/afile >adir/afileNEW &&
154
154
mv -f adir/afileNEW adir/afile &&
155
- echo "afile5" > adir/afile5 &&
155
+ echo "afile5" >adir/afile5 &&
156
156
rm t2 &&
157
157
cvs -f add adir/afile5 &&
158
158
cvs -f rm t2 &&
@@ -162,17 +162,17 @@ test_expect_success 'edit cvswork3 and save diff' '
162
162
163
163
test_expect_success ' setup v1.2 on b1' '
164
164
git checkout b1 &&
165
- echo "new v1.2" > t3 &&
165
+ echo "new v1.2" >t3 &&
166
166
rm t2 &&
167
167
sed -e "s/line3/line3 - more data/" adir/afile >adir/afileNEW &&
168
168
mv -f adir/afileNEW adir/afile &&
169
169
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 &&
172
172
rm adir/bdir/b2file &&
173
- echo "b3file" > adir/bdir/b3file &&
173
+ echo "b3file" >adir/bdir/b3file &&
174
174
mkdir cdir &&
175
- echo "cdir/cfile" > cdir/cfile &&
175
+ echo "cdir/cfile" >cdir/cfile &&
176
176
git add -A cdir adir t3 t2 &&
177
177
git commit -q -m ' v1.2' &&
178
178
git tag v1.2 &&
@@ -280,7 +280,7 @@ test_expect_success 'cvs co b2 [into cvswork2]' '
280
280
281
281
test_expect_success ' root dir edit [cvswork2]' '
282
282
( cd cvswork2 &&
283
- echo "Line 2" >> textfile.c &&
283
+ echo "Line 2" >>textfile.c &&
284
284
! cvs -f diff -u >"$WORKDIR/cvsEdit1.diff" &&
285
285
cvs -f commit -m "edit textfile.c" textfile.c
286
286
) >cvsEdit1.log 2>&1
@@ -289,10 +289,10 @@ test_expect_success 'root dir edit [cvswork2]' '
289
289
test_expect_success ' root dir rm file [cvswork2]' '
290
290
( cd cvswork2 &&
291
291
cvs -f rm -f t2 &&
292
- cvs -f diff -u > ../cvsEdit2-empty.diff &&
292
+ cvs -f diff -u >../cvsEdit2-empty.diff &&
293
293
! cvs -f diff -N -u >"$WORKDIR/cvsEdit2-N.diff" &&
294
294
cvs -f commit -m "rm t2"
295
- ) > cvsEdit2.log 2>&1
295
+ ) >cvsEdit2.log 2>&1
296
296
'
297
297
298
298
test_expect_success ' subdir edit/add/rm files [cvswork2' '
@@ -302,7 +302,7 @@ test_expect_success 'subdir edit/add/rm files [cvswork2' '
302
302
rm adir/bdir/b2file &&
303
303
cd adir &&
304
304
cvs -f rm bdir/b2file &&
305
- echo "4th file" > bdir/b4file &&
305
+ echo "4th file" >bdir/b4file &&
306
306
cvs -f add bdir/b4file &&
307
307
! cvs -f diff -N -u >"$WORKDIR/cvsEdit3.diff" &&
308
308
git fetch gitcvs.git b2:b2 &&
@@ -471,15 +471,15 @@ test_expect_success 'cvs diff -N -r v2 -u' '
471
471
! cvs -f diff -N -r v2 -u ) >cvsDiff.out 2>cvs.log &&
472
472
test ! -s cvs.log &&
473
473
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
475
475
'
476
476
477
477
test_expect_success ' cvs diff -N -r v2 -r v1.2' '
478
478
( cd cvswork &&
479
479
! cvs -f diff -N -r v2 -r v1.2 -u ) >cvsDiff.out 2>cvs.log &&
480
480
test ! -s cvs.log &&
481
481
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
483
483
'
484
484
485
485
test_expect_success ' apply early [cvswork3] diff to b3' '
@@ -499,7 +499,7 @@ test_expect_success 'check [cvswork3] diff' '
499
499
test -s cvsDiff.out &&
500
500
test $(grep Index: cvsDiff.out | wc -l) = 3 &&
501
501
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
503
503
'
504
504
505
505
test_expect_success ' merge early [cvswork3] b3 with b1' '
@@ -537,7 +537,7 @@ test_expect_success 'cvs up dirty [cvswork3]' '
537
537
test_expect_success ' cvs commit [cvswork3' '
538
538
( cd cvswork3 &&
539
539
cvs -f commit -m "dirty sandbox after auto-merge"
540
- ) > cvs.log 2>&1 &&
540
+ ) >cvs.log 2>&1 &&
541
541
check_start_tree cvswork3 &&
542
542
check_file cvswork3 textfile.c v3merged &&
543
543
check_file cvswork3 t3 v3merged &&
@@ -550,7 +550,7 @@ test_expect_success 'cvs commit [cvswork3' '
550
550
check_end_full_tree cvswork3 v3merged &&
551
551
git fetch gitcvs.git b3:b4 &&
552
552
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
554
554
'
555
555
556
556
test_done
0 commit comments