diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-12-18 18:47:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-19 07:46:44 -0800 |
| commit | 2d3ac9ad67b7038e1046dad3b1a273ba29282f31 (patch) | |
| tree | 6f4c3fce59de248fd58ebc0ad28e1eeb7d2fabc2 | |
| parent | Merge branch 'jc/maint-test-portability' into 'jc/test-portability' (diff) | |
| download | tgif-2d3ac9ad67b7038e1046dad3b1a273ba29282f31.tar.xz | |
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>
| -rwxr-xr-x | t/t3600-rm.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 06f63848ea..37bf5f13b0 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -474,7 +474,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 && @@ -508,7 +508,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 && @@ -606,7 +606,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 && |