Skip to content

Commit c327762

Browse files
charvi-077gitster
authored andcommitted
t7102,t7201: remove whitespace after redirect operator
According to Documentation/CodingGuidelines, redirect operator is written with space before, but no space after them. Let's remove these whitespaces after redirect operators. Signed-off-by: Charvi Mendiratta <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 78b8d93 commit c327762

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

t/t7102-reset.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ check_changes () {
7070

7171
test_expect_success 'reset --hard message' '
7272
hex=$(git log -1 --format="%h") &&
73-
git reset --hard > .actual &&
74-
echo HEAD is now at $hex $(commit_msg) > .expected &&
73+
git reset --hard >.actual &&
74+
echo HEAD is now at $hex $(commit_msg) >.expected &&
7575
test_i18ncmp .expected .actual
7676
'
7777

7878
test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '
7979
hex=$(git log -1 --format="%h") &&
80-
git -c "i18n.logOutputEncoding=$test_encoding" reset --hard > .actual &&
81-
echo HEAD is now at $hex $(commit_msg $test_encoding) > .expected &&
80+
git -c "i18n.logOutputEncoding=$test_encoding" reset --hard >.actual &&
81+
echo HEAD is now at $hex $(commit_msg $test_encoding) >.expected &&
8282
test_i18ncmp .expected .actual
8383
'
8484

@@ -387,25 +387,25 @@ test_expect_success '--hard reset to ORIG_HEAD should clear a fast-forward merge
387387
'
388388

389389
test_expect_success 'test --mixed <paths>' '
390-
echo 1 > file1 &&
391-
echo 2 > file2 &&
390+
echo 1 >file1 &&
391+
echo 2 >file2 &&
392392
git add file1 file2 &&
393393
test_tick &&
394394
git commit -m files &&
395395
before1=$(git rev-parse --short HEAD:file1) &&
396396
before2=$(git rev-parse --short HEAD:file2) &&
397397
git rm file2 &&
398-
echo 3 > file3 &&
399-
echo 4 > file4 &&
400-
echo 5 > file1 &&
398+
echo 3 >file3 &&
399+
echo 4 >file4 &&
400+
echo 5 >file1 &&
401401
after1=$(git rev-parse --short $(git hash-object file1)) &&
402402
after4=$(git rev-parse --short $(git hash-object file4)) &&
403403
git add file1 file3 file4 &&
404404
git reset HEAD -- file1 file2 file3 &&
405405
test_must_fail git diff --quiet &&
406-
git diff > output &&
406+
git diff >output &&
407407
408-
cat > expect <<-EOF &&
408+
cat >expect <<-EOF &&
409409
diff --git a/file1 b/file1
410410
index $before1..$after1 100644
411411
--- a/file1
@@ -423,9 +423,9 @@ test_expect_success 'test --mixed <paths>' '
423423
EOF
424424
425425
test_cmp expect output &&
426-
git diff --cached > output &&
426+
git diff --cached >output &&
427427
428-
cat > cached_expect <<-EOF &&
428+
cat >cached_expect <<-EOF &&
429429
diff --git a/file4 b/file4
430430
new file mode 100644
431431
index 0000000..$after4
@@ -460,14 +460,14 @@ test_expect_success 'resetting an unmodified path is a no-op' '
460460
git diff-index --cached --exit-code HEAD
461461
'
462462

463-
cat > expect << EOF
463+
cat >expect <<EOF
464464
Unstaged changes after reset:
465465
M file2
466466
EOF
467467

468468
test_expect_success '--mixed refreshes the index' '
469-
echo 123 >> file2 &&
470-
git reset --mixed HEAD > output &&
469+
echo 123 >>file2 &&
470+
git reset --mixed HEAD >output &&
471471
test_i18ncmp expect output
472472
'
473473

t/t7201-co.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fill () {
3333

3434

3535
test_expect_success setup '
36-
fill x y z > same &&
36+
fill x y z >same &&
3737
fill 1 2 3 4 5 6 7 8 >one &&
3838
fill a b c d e >two &&
3939
git add same one two &&
@@ -55,7 +55,7 @@ test_expect_success setup '
5555
5656
git checkout -b simple master &&
5757
rm -f one &&
58-
fill a c e > two &&
58+
fill a c e >two &&
5959
git commit -a -m "Simple D one, M two" &&
6060
6161
git checkout master
@@ -95,7 +95,7 @@ test_expect_success 'checkout -m with dirty tree' '
9595
git clean -f &&
9696
9797
fill 0 1 2 3 4 5 6 7 8 >one &&
98-
git checkout -m side > messages &&
98+
git checkout -m side >messages &&
9999
100100
test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
101101
@@ -159,7 +159,7 @@ test_expect_success 'checkout -m with merge conflict' '
159159
test_expect_success 'format of merge conflict from checkout -m' '
160160
git checkout -f master && git clean -f &&
161161
162-
fill b d > two &&
162+
fill b d >two &&
163163
git checkout -m simple &&
164164
165165
git ls-files >current &&
@@ -182,7 +182,7 @@ test_expect_success 'format of merge conflict from checkout -m' '
182182
test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
183183
git checkout -f master && git reset --hard && git clean -f &&
184184
185-
fill b d > two &&
185+
fill b d >two &&
186186
git checkout --merge --conflict=diff3 simple &&
187187
188188
cat <<-EOF >expect &&

0 commit comments

Comments
 (0)