From: Kyle J. McKay Date: Fri, 11 Apr 2014 08:24:02 +0000 (-0700) Subject: test: fix t7001 cp to use POSIX options X-Git-Tag: v2.0.0-rc0~8^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00764ca10e0b55b21853fe3f41d688254cfaec08;p=thirdparty%2Fgit.git test: fix t7001 cp to use POSIX options Since 11502468 and 04c1ee57 (both first appearing in v1.8.5), the t7001-mv test has used "cp -a" to perform a copy in several of the tests. However, the "-a" option is not required for a POSIX cp utility and some platforms' cp utilities do not support it. The POSIX equivalent of -a is -R -P -p. Change "cp -a" to "cp -R -P -p" so that the t7001-mv test works on systems with a cp utility that only implements the POSIX required set of options and not the "-a" option. Signed-off-by: Kyle J. McKay Signed-off-by: Junio C Hamano --- diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 3bfdfed1f7..9727e79b68 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -307,7 +307,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm ( cd sub && rm -f .git && - cp -a ../.git/modules/sub .git && + cp -R -P -p ../.git/modules/sub .git && GIT_WORK_TREE=. git config --unset core.worktree ) && mkdir mod && @@ -330,7 +330,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu ( cd sub && rm -f .git && - cp -a ../.git/modules/sub .git && + cp -R -P -p ../.git/modules/sub .git && GIT_WORK_TREE=. git config --unset core.worktree ) && mkdir mod &&