@@ -70,15 +70,15 @@ check_changes () {
70
70
71
71
test_expect_success ' reset --hard message' '
72
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
75
test_i18ncmp .expected .actual
76
76
'
77
77
78
78
test_expect_success ' reset --hard message (ISO8859-1 logoutputencoding)' '
79
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
82
test_i18ncmp .expected .actual
83
83
'
84
84
@@ -387,25 +387,25 @@ test_expect_success '--hard reset to ORIG_HEAD should clear a fast-forward merge
387
387
'
388
388
389
389
test_expect_success ' test --mixed <paths>' '
390
- echo 1 > file1 &&
391
- echo 2 > file2 &&
390
+ echo 1 >file1 &&
391
+ echo 2 >file2 &&
392
392
git add file1 file2 &&
393
393
test_tick &&
394
394
git commit -m files &&
395
395
before1=$(git rev-parse --short HEAD:file1) &&
396
396
before2=$(git rev-parse --short HEAD:file2) &&
397
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
401
after1=$(git rev-parse --short $(git hash-object file1)) &&
402
402
after4=$(git rev-parse --short $(git hash-object file4)) &&
403
403
git add file1 file3 file4 &&
404
404
git reset HEAD -- file1 file2 file3 &&
405
405
test_must_fail git diff --quiet &&
406
- git diff > output &&
406
+ git diff >output &&
407
407
408
- cat > expect <<-EOF &&
408
+ cat >expect <<-EOF &&
409
409
diff --git a/file1 b/file1
410
410
index $before1..$after1 100644
411
411
--- a/file1
@@ -423,9 +423,9 @@ test_expect_success 'test --mixed <paths>' '
423
423
EOF
424
424
425
425
test_cmp expect output &&
426
- git diff --cached > output &&
426
+ git diff --cached >output &&
427
427
428
- cat > cached_expect <<-EOF &&
428
+ cat >cached_expect <<-EOF &&
429
429
diff --git a/file4 b/file4
430
430
new file mode 100644
431
431
index 0000000..$after4
@@ -460,14 +460,14 @@ test_expect_success 'resetting an unmodified path is a no-op' '
460
460
git diff-index --cached --exit-code HEAD
461
461
'
462
462
463
- cat > expect << EOF
463
+ cat > expect << EOF
464
464
Unstaged changes after reset:
465
465
M file2
466
466
EOF
467
467
468
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
471
test_i18ncmp expect output
472
472
'
473
473
0 commit comments