зеркало из https://github.com/microsoft/git.git
t3600: Avoid "cp -a", which is a GNUism
With d4a7ffa
(tests: "cp -a" is a GNUism, 2012-10-08), we got rid of
most of them, but the ones in a topic that was still in flight were
missed.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
ecd3e2f425
Коммит
2d3ac9ad67
|
@ -474,7 +474,7 @@ test_expect_success 'rm of a conflicted populated submodule with a .git director
|
||||||
git submodule update &&
|
git submodule update &&
|
||||||
(cd submod &&
|
(cd submod &&
|
||||||
rm .git &&
|
rm .git &&
|
||||||
cp -a ../.git/modules/sub .git &&
|
cp -R ../.git/modules/sub .git &&
|
||||||
GIT_WORK_TREE=. git config --unset core.worktree
|
GIT_WORK_TREE=. git config --unset core.worktree
|
||||||
) &&
|
) &&
|
||||||
test_must_fail git merge conflict2 &&
|
test_must_fail git merge conflict2 &&
|
||||||
|
@ -508,7 +508,7 @@ test_expect_success 'rm of a populated submodule with a .git directory fails eve
|
||||||
git submodule update &&
|
git submodule update &&
|
||||||
(cd submod &&
|
(cd submod &&
|
||||||
rm .git &&
|
rm .git &&
|
||||||
cp -a ../.git/modules/sub .git &&
|
cp -R ../.git/modules/sub .git &&
|
||||||
GIT_WORK_TREE=. git config --unset core.worktree
|
GIT_WORK_TREE=. git config --unset core.worktree
|
||||||
) &&
|
) &&
|
||||||
test_must_fail git rm submod &&
|
test_must_fail git rm submod &&
|
||||||
|
@ -606,7 +606,7 @@ test_expect_success 'rm of a populated nested submodule with a nested .git direc
|
||||||
git submodule update --recursive &&
|
git submodule update --recursive &&
|
||||||
(cd submod/subsubmod &&
|
(cd submod/subsubmod &&
|
||||||
rm .git &&
|
rm .git &&
|
||||||
cp -a ../../.git/modules/sub/modules/sub .git &&
|
cp -R ../../.git/modules/sub/modules/sub .git &&
|
||||||
GIT_WORK_TREE=. git config --unset core.worktree
|
GIT_WORK_TREE=. git config --unset core.worktree
|
||||||
) &&
|
) &&
|
||||||
test_must_fail git rm submod &&
|
test_must_fail git rm submod &&
|
||||||
|
|
Загрузка…
Ссылка в новой задаче