kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2019-12-25 11:22:01 -08:00
parent 65099bd775 675ef6bab8
commit 8be0a428d6
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t3501-revert-cherry-pick.sh
View File

@ -150,7 +150,7 @@ test_expect_success 'cherry-pick works with dirty renamed file' '
test_tick && test_tick &&
git commit -m renamed && git commit -m renamed &&
echo modified >renamed && echo modified >renamed &&
git cherry-pick refs/heads/unrelated >out && git cherry-pick refs/heads/unrelated &&
test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) && test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) &&
grep -q "^modified$" renamed grep -q "^modified$" renamed
' '

2
t/t4256-am-format-flowed.sh
View File

@ -11,7 +11,7 @@ test_expect_success 'setup' '
' '


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

2
t/t5580-clone-push-unc.sh
View File

@ -58,7 +58,7 @@ test_expect_success push '


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



2
t/t6030-bisect-porcelain.sh
View File

@ -482,7 +482,7 @@ test_expect_success 'optimized merge base checks' '
git bisect good > my_bisect_log2.txt && git bisect good > my_bisect_log2.txt &&
test -f ".git/BISECT_ANCESTORS_OK" && test -f ".git/BISECT_ANCESTORS_OK" &&
test "$HASH6" = $(git rev-parse --verify HEAD) && test "$HASH6" = $(git rev-parse --verify HEAD) &&
git bisect bad > my_bisect_log3.txt && git bisect bad &&
git bisect good "$A_HASH" > my_bisect_log4.txt && git bisect good "$A_HASH" > my_bisect_log4.txt &&
test_i18ngrep "merge base must be tested" my_bisect_log4.txt && test_i18ngrep "merge base must be tested" my_bisect_log4.txt &&
test_must_fail test -f ".git/BISECT_ANCESTORS_OK" test_must_fail test -f ".git/BISECT_ANCESTORS_OK"

1
t/t7004-tag.sh
View File

@ -517,7 +517,6 @@ test_expect_success \
test_expect_success \ test_expect_success \
'trying to create tags giving both -m or -F options should fail' ' 'trying to create tags giving both -m or -F options should fail' '
echo "message file 1" >msgfile1 && echo "message file 1" >msgfile1 &&
echo "message file 2" >msgfile2 &&
! tag_exists msgtag && ! tag_exists msgtag &&
test_must_fail git tag -m "message 1" -F msgfile1 msgtag && test_must_fail git tag -m "message 1" -F msgfile1 msgtag &&
! tag_exists msgtag && ! tag_exists msgtag &&