summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-05-08 09:59:41 -0700
committerJunio C Hamano <gitster@pobox.com>2014-05-08 09:59:41 -0700
commit73edc54e9083695cebaeebdac6d9a459ff7b04fd (patch)
tree473dd86fbc126bb9a8a8d089d636b727df378497 /t
parent0bc85abb7aa9b24b093253018801a0fb43d01122 (diff)
parent00764ca10e0b55b21853fe3f41d688254cfaec08 (diff)
downloadgit-73edc54e9083695cebaeebdac6d9a459ff7b04fd.tar.gz
Merge branch 'km/avoid-cp-a' into maint
Some tests used shell constructs that did not work well on FreeBSD * km/avoid-cp-a: test: fix t7001 cp to use POSIX options
Diffstat (limited to 't')
-rwxr-xr-xt/t7001-mv.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 215d43d6a6..c8ff9115ec 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -308,7 +308,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 &&
@@ -331,7 +331,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 &&