Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 1c2828c

Browse files
chriscoolgitster
authored andcommitted
replace: cleanup redirection style in tests
Signed-off-by: Christian Couder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 063da62 commit 1c2828c

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

t/t6050-replace.sh

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,36 @@ HASH6=
2727
HASH7=
2828

2929
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 &&
3434
add_and_commit_file hello "4 lines" &&
3535
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 &&
4040
add_and_commit_file hello "4 more lines with a BUG" &&
4141
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 &&
4444
add_and_commit_file hello "2 more lines" &&
4545
HASH3=$(git rev-parse --verify HEAD) &&
46-
echo "line 11" >> hello &&
46+
echo "line 11" >>hello &&
4747
add_and_commit_file hello "1 more line" &&
4848
HASH4=$(git rev-parse --verify HEAD) &&
49-
sed -e "s/BUG/5/" hello > hello.new &&
49+
sed -e "s/BUG/5/" hello >hello.new &&
5050
mv hello.new hello &&
5151
add_and_commit_file hello "BUG fixed" &&
5252
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 &&
5555
add_and_commit_file hello "2 more lines" &&
5656
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 &&
6060
add_and_commit_file hello "again 3 more lines" &&
6161
HASH7=$(git rev-parse --verify HEAD)
6262
'
@@ -95,7 +95,7 @@ test_expect_success 'tag replaced commit' '
9595
'
9696

9797
test_expect_success '"git fsck" works' '
98-
git fsck master > fsck_master.out &&
98+
git fsck master >fsck_master.out &&
9999
grep "dangling commit $R" fsck_master.out &&
100100
grep "dangling tag $(cat .git/refs/tags/mytag)" fsck_master.out &&
101101
test -z "$(git fsck)"
@@ -217,14 +217,14 @@ test_expect_success 'fetch branch with replacement' '
217217
(
218218
cd clone_dir &&
219219
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 &&
221221
! grep $PARA3 output.txt &&
222-
git show $PARA3 > para3.txt &&
222+
git show $PARA3 >para3.txt &&
223223
grep "A U Thor" para3.txt &&
224224
git fetch origin "refs/replace/*:refs/replace/*" &&
225-
git log --pretty=oneline parallel3 > output.txt &&
225+
git log --pretty=oneline parallel3 >output.txt &&
226226
grep $PARA3 output.txt &&
227-
git show $PARA3 > para3.txt &&
227+
git show $PARA3 >para3.txt &&
228228
grep "O Thor" para3.txt
229229
)
230230
'
@@ -302,7 +302,7 @@ test_expect_success 'test --format medium' '
302302
echo "$PARA3 -> $S" &&
303303
echo "$MYTAG -> $HASH1"
304304
} | sort >expected &&
305-
git replace -l --format medium | sort > actual &&
305+
git replace -l --format medium | sort >actual &&
306306
test_cmp expected actual
307307
'
308308

@@ -314,7 +314,7 @@ test_expect_success 'test --format long' '
314314
echo "$PARA3 (commit) -> $S (commit)" &&
315315
echo "$MYTAG (tag) -> $HASH1 (commit)"
316316
} | sort >expected &&
317-
git replace --format=long | sort > actual &&
317+
git replace --format=long | sort >actual &&
318318
test_cmp expected actual
319319
'
320320

0 commit comments

Comments
 (0)