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 <charvi077@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Charvi Mendiratta committed
Oct 20, 2020 at 17:13 UTC
c327762f812788b13279fbcb14774151240e82b7
2 files changed
+21
-21
t/t7102-reset.sh
+16
-16
@@ -70,15 +70,15 @@ check_changes () {
70
71
test_expect_success 'reset --hard message' '
72
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 &&
75
test_i18ncmp .expected .actual
76
'
77
78
test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '
79
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 &&
82
test_i18ncmp .expected .actual
83
'
84
@@ -387,25 +387,25 @@ test_expect_success '--hard reset to ORIG_HEAD should clear a fast-forward merge
387
'
388
389
test_expect_success 'test --mixed <paths>' '
390
- echo 1 > file1 &&
391
- echo 2 > file2 &&
390
+ echo 1 >file1 &&
391
+ echo 2 >file2 &&
392
git add file1 file2 &&
393
test_tick &&
394
git commit -m files &&
395
before1=$(git rev-parse --short HEAD:file1) &&
396
before2=$(git rev-parse --short HEAD:file2) &&
397
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 &&
401
after1=$(git rev-parse --short $(git hash-object file1)) &&
402
after4=$(git rev-parse --short $(git hash-object file4)) &&
403
git add file1 file3 file4 &&
404
git reset HEAD -- file1 file2 file3 &&
405
test_must_fail git diff --quiet &&
406
- git diff > output &&
406
+ git diff >output &&
407
408
- cat > expect <<-EOF &&
408
+ cat >expect <<-EOF &&
409
diff --git a/file1 b/file1
410
index $before1..$after1 100644
411
--- a/file1
@@ -423,9 +423,9 @@ test_expect_success 'test --mixed <paths>' '
423
EOF
424
425
test_cmp expect output &&
426
- git diff --cached > output &&
426
+ git diff --cached >output &&
427
428
- cat > cached_expect <<-EOF &&
428
+ cat >cached_expect <<-EOF &&
429
diff --git a/file4 b/file4
430
new file mode 100644
431
index 0000000..$after4
@@ -460,14 +460,14 @@ test_expect_success 'resetting an unmodified path is a no-op' '
460
git diff-index --cached --exit-code HEAD
461
'
462
463
-cat > expect << EOF
463
+cat >expect <<EOF
464
Unstaged changes after reset:
465
M file2
466
EOF
467
468
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 &&
471
test_i18ncmp expect output
472
'
473
t/t7201-co.sh
+5
-5
@@ -33,7 +33,7 @@ fill () {
33
34
35
test_expect_success setup '
36
- fill x y z > same &&
36
+ fill x y z >same &&
37
fill 1 2 3 4 5 6 7 8 >one &&
38
fill a b c d e >two &&
39
git add same one two &&
@@ -55,7 +55,7 @@ test_expect_success setup '
55
56
git checkout -b simple master &&
57
rm -f one &&
58
- fill a c e > two &&
58
+ fill a c e >two &&
59
git commit -a -m "Simple D one, M two" &&
60
61
git checkout master
@@ -95,7 +95,7 @@ test_expect_success 'checkout -m with dirty tree' '
95
git clean -f &&
96
97
fill 0 1 2 3 4 5 6 7 8 >one &&
98
- git checkout -m side > messages &&
98
+ git checkout -m side >messages &&
99
100
test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
101
@@ -159,7 +159,7 @@ test_expect_success 'checkout -m with merge conflict' '
159
test_expect_success 'format of merge conflict from checkout -m' '
160
git checkout -f master && git clean -f &&
161
162
- fill b d > two &&
162
+ fill b d >two &&
163
git checkout -m simple &&
164
165
git ls-files >current &&
@@ -182,7 +182,7 @@ test_expect_success 'format of merge conflict from checkout -m' '
182
test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
183
git checkout -f master && git reset --hard && git clean -f &&
184
185
- fill b d > two &&
185
+ fill b d >two &&
186
git checkout --merge --conflict=diff3 simple &&
187
188
cat <<-EOF >expect &&