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>
Junio C Hamano committed
Dec 18, 2012 at 18:47 UTC
2d3ac9ad67b7038e1046dad3b1a273ba29282f31
1 file changed
+3
-3
t/t3600-rm.sh
+3
-3
@@ -474,7 +474,7 @@ test_expect_success 'rm of a conflicted populated submodule with a .git director
474
git submodule update &&
475
(cd submod &&
476
rm .git &&
477
- cp -a ../.git/modules/sub .git &&
477
+ cp -R ../.git/modules/sub .git &&
478
GIT_WORK_TREE=. git config --unset core.worktree
479
) &&
480
test_must_fail git merge conflict2 &&
@@ -508,7 +508,7 @@ test_expect_success 'rm of a populated submodule with a .git directory fails eve
508
git submodule update &&
509
(cd submod &&
510
rm .git &&
511
- cp -a ../.git/modules/sub .git &&
511
+ cp -R ../.git/modules/sub .git &&
512
GIT_WORK_TREE=. git config --unset core.worktree
513
) &&
514
test_must_fail git rm submod &&
@@ -606,7 +606,7 @@ test_expect_success 'rm of a populated nested submodule with a nested .git direc
606
git submodule update --recursive &&
607
(cd submod/subsubmod &&
608
rm .git &&
609
- cp -a ../../.git/modules/sub/modules/sub .git &&
609
+ cp -R ../../.git/modules/sub/modules/sub .git &&
610
GIT_WORK_TREE=. git config --unset core.worktree
611
) &&
612
test_must_fail git rm submod &&