зеркало из https://github.com/microsoft/git.git
t3509: use unconstrained initial test to setup repository.
The first test did not run on msysGit due to the SYMLINKS constraint and so subsequent tests failed because the test repository was not initialized. Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
13af8cbd6a
Коммит
899663f8e4
|
@ -3,12 +3,14 @@
|
|||
test_description='Test cherry-pick with directory/file conflicts'
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
|
||||
test_expect_success 'Initialize repository' '
|
||||
mkdir a &&
|
||||
>a/f &&
|
||||
git add a &&
|
||||
git commit -m a &&
|
||||
git commit -m a
|
||||
'
|
||||
|
||||
test_expect_success SYMLINKS 'Setup rename across paths each below D/F conflicts' '
|
||||
mkdir b &&
|
||||
ln -s ../a b/a &&
|
||||
git add b &&
|
||||
|
|
Загрузка…
Ссылка в новой задаче