File tree Expand file tree Collapse file tree 5 files changed +12
-15
lines changed Expand file tree Collapse file tree 5 files changed +12
-15
lines changed Original file line number Diff line number Diff line change @@ -808,7 +808,7 @@ test_expect_success 'credential config with partial URLs' '
808
808
809
809
git -c credential.$partial.helper=yep \
810
810
-c credential.with%0anewline.username=uh-oh \
811
- credential fill <stdin >stdout 2>stderr &&
811
+ credential fill <stdin 2>stderr &&
812
812
test_i18ngrep "skipping credential lookup for key" stderr
813
813
'
814
814
Original file line number Diff line number Diff line change @@ -1601,11 +1601,11 @@ test_expect_success 'git config --edit respects core.editor' '
1601
1601
# malformed configuration files
1602
1602
test_expect_success ' barf on syntax error' '
1603
1603
cat >.git/config <<-\EOF &&
1604
- # broken section line
1604
+ # broken key=value
1605
1605
[section]
1606
1606
key garbage
1607
1607
EOF
1608
- test_must_fail git config --get section.key >actual 2>error &&
1608
+ test_must_fail git config --get section.key 2>error &&
1609
1609
test_i18ngrep " line 3 " error
1610
1610
'
1611
1611
@@ -1615,17 +1615,17 @@ test_expect_success 'barf on incomplete section header' '
1615
1615
[section
1616
1616
key = value
1617
1617
EOF
1618
- test_must_fail git config --get section.key >actual 2>error &&
1618
+ test_must_fail git config --get section.key 2>error &&
1619
1619
test_i18ngrep " line 2 " error
1620
1620
'
1621
1621
1622
1622
test_expect_success ' barf on incomplete string' '
1623
1623
cat >.git/config <<-\EOF &&
1624
- # broken section line
1624
+ # broken value string
1625
1625
[section]
1626
1626
key = "value string
1627
1627
EOF
1628
- test_must_fail git config --get section.key >actual 2>error &&
1628
+ test_must_fail git config --get section.key 2>error &&
1629
1629
test_i18ngrep " line 3 " error
1630
1630
'
1631
1631
Original file line number Diff line number Diff line change @@ -989,10 +989,7 @@ test_expect_success 'fsck error and recovery on invalid object type' '
989
989
990
990
garbage_blob=$(git hash-object --stdin -w -t garbage --literally </dev/null) &&
991
991
992
- cat >err.expect <<-\EOF &&
993
- fatal: invalid object type
994
- EOF
995
- test_must_fail git fsck >out 2>err &&
992
+ test_must_fail git fsck 2>err &&
996
993
grep -e "^error" -e "^fatal" err >errors &&
997
994
test_line_count = 1 errors &&
998
995
grep "$garbage_blob: object is of unknown type ' " '" ' garbage' " '" ' :" err
Original file line number Diff line number Diff line change @@ -302,14 +302,14 @@ test_expect_success 'test --parseopt help output: "wrapped" options normal "or:"
302
302
|EOF
303
303
END_EXPECT
304
304
305
- test_must_fail git rev-parse --parseopt -- -h >out <spec >actual &&
305
+ test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
306
306
test_cmp expect actual
307
307
'
308
308
309
309
test_expect_success ' test --parseopt invalid opt-spec' '
310
310
test_write_lines x -- "=, x" >spec &&
311
311
echo "fatal: missing opt-spec before option flags" >expect &&
312
- test_must_fail git rev-parse --parseopt -- >out <spec 2>err &&
312
+ test_must_fail git rev-parse --parseopt -- <spec 2>err &&
313
313
test_cmp expect err
314
314
'
315
315
@@ -339,7 +339,7 @@ test_expect_success 'test --parseopt help output: multi-line blurb after empty l
339
339
|EOF
340
340
END_EXPECT
341
341
342
- test_must_fail git rev-parse --parseopt -- -h >out <spec >actual &&
342
+ test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
343
343
test_cmp expect actual
344
344
'
345
345
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ test_expect_success 'setup ambiguous refs' '
16
16
'
17
17
18
18
test_expect_success ' checkout ambiguous ref succeeds' '
19
- git checkout ambiguity >stdout 2>stderr
19
+ git checkout ambiguity 2>stderr
20
20
'
21
21
22
22
test_expect_success ' checkout produces ambiguity warning' '
@@ -37,7 +37,7 @@ test_expect_success 'checkout reports switch to branch' '
37
37
'
38
38
39
39
test_expect_success ' checkout vague ref succeeds' '
40
- git checkout vagueness >stdout 2>stderr &&
40
+ git checkout vagueness 2>stderr &&
41
41
test_set_prereq VAGUENESS_SUCCESS
42
42
'
43
43
You can’t perform that action at this time.
0 commit comments