Skip to content

Commit 8be0a42

Browse files
committed
Merge branch 'rs/test-cleanup'
Test cleanup. * rs/test-cleanup: t6030: don't create unused file t5580: don't create unused file t3501: don't create unused file t7004: don't create unused file t4256: don't create unused file
2 parents 65099bd + 675ef6b commit 8be0a42

5 files changed

+4
-5
lines changed

t/t3501-revert-cherry-pick.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ test_expect_success 'cherry-pick works with dirty renamed file' '
150150
test_tick &&
151151
git commit -m renamed &&
152152
echo modified >renamed &&
153-
git cherry-pick refs/heads/unrelated >out &&
153+
git cherry-pick refs/heads/unrelated &&
154154
test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) &&
155155
grep -q "^modified$" renamed
156156
'

t/t4256-am-format-flowed.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test_expect_success 'setup' '
1111
'
1212

1313
test_expect_success 'am with format=flowed' '
14-
git am <"$TEST_DIRECTORY/t4256/1/patch" >stdout 2>stderr &&
14+
git am <"$TEST_DIRECTORY/t4256/1/patch" 2>stderr &&
1515
test_i18ngrep "warning: Patch sent with format=flowed" stderr &&
1616
test_cmp "$TEST_DIRECTORY/t4256/1/mailinfo.c" mailinfo.c
1717
'

t/t5580-clone-push-unc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ test_expect_success push '
5858

5959
test_expect_success MINGW 'remote nick cannot contain backslashes' '
6060
BACKSLASHED="$(winpwd | tr / \\\\)" &&
61-
git ls-remote "$BACKSLASHED" >out 2>err &&
61+
git ls-remote "$BACKSLASHED" 2>err &&
6262
test_i18ngrep ! "unable to access" err
6363
'
6464

t/t6030-bisect-porcelain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ test_expect_success 'optimized merge base checks' '
482482
git bisect good > my_bisect_log2.txt &&
483483
test -f ".git/BISECT_ANCESTORS_OK" &&
484484
test "$HASH6" = $(git rev-parse --verify HEAD) &&
485-
git bisect bad > my_bisect_log3.txt &&
485+
git bisect bad &&
486486
git bisect good "$A_HASH" > my_bisect_log4.txt &&
487487
test_i18ngrep "merge base must be tested" my_bisect_log4.txt &&
488488
test_must_fail test -f ".git/BISECT_ANCESTORS_OK"

t/t7004-tag.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,6 @@ test_expect_success \
517517
test_expect_success \
518518
'trying to create tags giving both -m or -F options should fail' '
519519
echo "message file 1" >msgfile1 &&
520-
echo "message file 2" >msgfile2 &&
521520
! tag_exists msgtag &&
522521
test_must_fail git tag -m "message 1" -F msgfile1 msgtag &&
523522
! tag_exists msgtag &&

0 commit comments

Comments
 (0)