replace: cleanup redirection style in tests
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder committed
Jul 7, 2014 at 08:35 UTC
1c2828c194bf4bc9dba2cc1f12cd0687263af94b
1 file changed
+24
-24
t/t6050-replace.sh
+24
-24
@@ -27,36 +27,36 @@ HASH6=
27
HASH7=
28
29
test_expect_success 'set up buggy branch' '
30
- echo "line 1" >> hello &&
31
- echo "line 2" >> hello &&
32
- echo "line 3" >> hello &&
33
- echo "line 4" >> hello &&
30
+ echo "line 1" >>hello &&
31
+ echo "line 2" >>hello &&
32
+ echo "line 3" >>hello &&
33
+ echo "line 4" >>hello &&
34
add_and_commit_file hello "4 lines" &&
35
HASH1=$(git rev-parse --verify HEAD) &&
36
- echo "line BUG" >> hello &&
37
- echo "line 6" >> hello &&
38
- echo "line 7" >> hello &&
39
- echo "line 8" >> hello &&
36
+ echo "line BUG" >>hello &&
37
+ echo "line 6" >>hello &&
38
+ echo "line 7" >>hello &&
39
+ echo "line 8" >>hello &&
40
add_and_commit_file hello "4 more lines with a BUG" &&
41
HASH2=$(git rev-parse --verify HEAD) &&
42
- echo "line 9" >> hello &&
43
- echo "line 10" >> hello &&
42
+ echo "line 9" >>hello &&
43
+ echo "line 10" >>hello &&
44
add_and_commit_file hello "2 more lines" &&
45
HASH3=$(git rev-parse --verify HEAD) &&
46
- echo "line 11" >> hello &&
46
+ echo "line 11" >>hello &&
47
add_and_commit_file hello "1 more line" &&
48
HASH4=$(git rev-parse --verify HEAD) &&
49
- sed -e "s/BUG/5/" hello > hello.new &&
49
+ sed -e "s/BUG/5/" hello >hello.new &&
50
mv hello.new hello &&
51
add_and_commit_file hello "BUG fixed" &&
52
HASH5=$(git rev-parse --verify HEAD) &&
53
- echo "line 12" >> hello &&
54
- echo "line 13" >> hello &&
53
+ echo "line 12" >>hello &&
54
+ echo "line 13" >>hello &&
55
add_and_commit_file hello "2 more lines" &&
56
HASH6=$(git rev-parse --verify HEAD) &&
57
- echo "line 14" >> hello &&
58
- echo "line 15" >> hello &&
59
- echo "line 16" >> hello &&
57
+ echo "line 14" >>hello &&
58
+ echo "line 15" >>hello &&
59
+ echo "line 16" >>hello &&
60
add_and_commit_file hello "again 3 more lines" &&
61
HASH7=$(git rev-parse --verify HEAD)
62
'
@@ -95,7 +95,7 @@ test_expect_success 'tag replaced commit' '
95
'
96
97
test_expect_success '"git fsck" works' '
98
- git fsck master > fsck_master.out &&
98
+ git fsck master >fsck_master.out &&
99
grep "dangling commit $R" fsck_master.out &&
100
grep "dangling tag $(cat .git/refs/tags/mytag)" fsck_master.out &&
101
test -z "$(git fsck)"
@@ -217,14 +217,14 @@ test_expect_success 'fetch branch with replacement' '
217
(
218
cd clone_dir &&
219
git fetch origin refs/heads/tofetch:refs/heads/parallel3 &&
220
- git log --pretty=oneline parallel3 > output.txt &&
220
+ git log --pretty=oneline parallel3 >output.txt &&
221
! grep $PARA3 output.txt &&
222
- git show $PARA3 > para3.txt &&
222
+ git show $PARA3 >para3.txt &&
223
grep "A U Thor" para3.txt &&
224
git fetch origin "refs/replace/*:refs/replace/*" &&
225
- git log --pretty=oneline parallel3 > output.txt &&
225
+ git log --pretty=oneline parallel3 >output.txt &&
226
grep $PARA3 output.txt &&
227
- git show $PARA3 > para3.txt &&
227
+ git show $PARA3 >para3.txt &&
228
grep "O Thor" para3.txt
229
)
230
'
@@ -302,7 +302,7 @@ test_expect_success 'test --format medium' '
302
echo "$PARA3 -> $S" &&
303
echo "$MYTAG -> $HASH1"
304
} | sort >expected &&
305
- git replace -l --format medium | sort > actual &&
305
+ git replace -l --format medium | sort >actual &&
306
test_cmp expected actual
307
'
308
@@ -314,7 +314,7 @@ test_expect_success 'test --format long' '
314
echo "$PARA3 (commit) -> $S (commit)" &&
315
echo "$MYTAG (tag) -> $HASH1 (commit)"
316
} | sort >expected &&
317
- git replace --format=long | sort > actual &&
317
+ git replace --format=long | sort >actual &&
318
test_cmp expected actual
319
'
320