[PATCH] t3600: Avoid "cp -a" which is a GNUism
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 19, 2012, 02:55 UTC
- Message-ID
- <7vtxrida40.fsf@alter.siamese.dyndns.org>
With d4a7ffa (tests: "cp -a" is a GNUism, 2012-10-08), we got rid of most of them, but a topic that was still in flight was missed.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- t/t3600-rm.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 97254e8..324924e 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -457,7 +457,7 @@ test_expect_success 'rm of a conflicted populated submodule with a .git director git submodule update && (cd submod && rm .git && - cp -a ../.git/modules/sub .git && + cp -R ../.git/modules/sub .git && GIT_WORK_TREE=. git config --unset core.worktree ) && test_must_fail git merge conflict2 && @@ -491,7 +491,7 @@ test_expect_success 'rm of a populated submodule with a .git directory fails eve git submodule update && (cd submod && rm .git && - cp -a ../.git/modules/sub .git && + cp -R ../.git/modules/sub .git && GIT_WORK_TREE=. git config --unset core.worktree ) && test_must_fail git rm submod && @@ -589,7 +589,7 @@ test_expect_success 'rm of a populated nested submodule with a nested .git direc git submodule update --recursive && (cd submod/subsubmod && 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 ) && test_must_fail git rm submod &&
-- 1.8.1.rc2.196.g90926c8