Skip to content

Commit 2d3ac9a

Browse files
committed
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 <[email protected]>
1 parent ecd3e2f commit 2d3ac9a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

t/t3600-rm.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ test_expect_success 'rm of a conflicted populated submodule with a .git director
474474
git submodule update &&
475475
(cd submod &&
476476
rm .git &&
477-
cp -a ../.git/modules/sub .git &&
477+
cp -R ../.git/modules/sub .git &&
478478
GIT_WORK_TREE=. git config --unset core.worktree
479479
) &&
480480
test_must_fail git merge conflict2 &&
@@ -508,7 +508,7 @@ test_expect_success 'rm of a populated submodule with a .git directory fails eve
508508
git submodule update &&
509509
(cd submod &&
510510
rm .git &&
511-
cp -a ../.git/modules/sub .git &&
511+
cp -R ../.git/modules/sub .git &&
512512
GIT_WORK_TREE=. git config --unset core.worktree
513513
) &&
514514
test_must_fail git rm submod &&
@@ -606,7 +606,7 @@ test_expect_success 'rm of a populated nested submodule with a nested .git direc
606606
git submodule update --recursive &&
607607
(cd submod/subsubmod &&
608608
rm .git &&
609-
cp -a ../../.git/modules/sub/modules/sub .git &&
609+
cp -R ../../.git/modules/sub/modules/sub .git &&
610610
GIT_WORK_TREE=. git config --unset core.worktree
611611
) &&
612612
test_must_fail git rm submod &&

0 commit comments

Comments
 (0)