зеркало из https://github.com/microsoft/git.git
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
This commit is contained in:
Коммит
8be0a428d6
|
@ -150,7 +150,7 @@ test_expect_success 'cherry-pick works with dirty renamed file' '
|
|||
test_tick &&
|
||||
git commit -m 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) &&
|
||||
grep -q "^modified$" renamed
|
||||
'
|
||||
|
|
|
@ -11,7 +11,7 @@ test_expect_success 'setup' '
|
|||
'
|
||||
|
||||
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_cmp "$TEST_DIRECTORY/t4256/1/mailinfo.c" mailinfo.c
|
||||
'
|
||||
|
|
|
@ -58,7 +58,7 @@ test_expect_success push '
|
|||
|
||||
test_expect_success MINGW 'remote nick cannot contain backslashes' '
|
||||
BACKSLASHED="$(winpwd | tr / \\\\)" &&
|
||||
git ls-remote "$BACKSLASHED" >out 2>err &&
|
||||
git ls-remote "$BACKSLASHED" 2>err &&
|
||||
test_i18ngrep ! "unable to access" err
|
||||
'
|
||||
|
||||
|
|
|
@ -482,7 +482,7 @@ test_expect_success 'optimized merge base checks' '
|
|||
git bisect good > my_bisect_log2.txt &&
|
||||
test -f ".git/BISECT_ANCESTORS_OK" &&
|
||||
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 &&
|
||||
test_i18ngrep "merge base must be tested" my_bisect_log4.txt &&
|
||||
test_must_fail test -f ".git/BISECT_ANCESTORS_OK"
|
||||
|
|
|
@ -517,7 +517,6 @@ test_expect_success \
|
|||
test_expect_success \
|
||||
'trying to create tags giving both -m or -F options should fail' '
|
||||
echo "message file 1" >msgfile1 &&
|
||||
echo "message file 2" >msgfile2 &&
|
||||
! tag_exists msgtag &&
|
||||
test_must_fail git tag -m "message 1" -F msgfile1 msgtag &&
|
||||
! tag_exists msgtag &&
|
||||
|
|
Загрузка…
Ссылка в новой задаче