From 6d3e23d45cb224cbfac9d0c379cdc91d7fa63c0c Mon Sep 17 00:00:00 2001 From: Stepan Kasal Date: Wed, 14 May 2014 11:18:12 +0200 Subject: [PATCH] Revert "test: fix t7001 cp to use POSIX options" This reverts commit 00764ca1, as our ancient version of "cp" has problems about the "new" POSIX option "-P" (yields exit code 1). --- t/t7001-mv.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 54d78079e8..34fb1afbb3 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -308,7 +308,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm ( cd sub && rm -f .git && - cp -R -P -p ../.git/modules/sub .git && + cp -a ../.git/modules/sub .git && GIT_WORK_TREE=. git config --unset core.worktree ) && mkdir mod && @@ -331,7 +331,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu ( cd sub && rm -f .git && - cp -R -P -p ../.git/modules/sub .git && + cp -a ../.git/modules/sub .git && GIT_WORK_TREE=. git config --unset core.worktree ) && mkdir mod && -- 2.11.4.GIT