diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-08 09:59:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-08 09:59:41 -0700 |
| commit | 73edc54e9083695cebaeebdac6d9a459ff7b04fd (patch) | |
| tree | 473dd86fbc126bb9a8a8d089d636b727df378497 | |
| parent | 0bc85abb7aa9b24b093253018801a0fb43d01122 (diff) | |
| parent | 00764ca10e0b55b21853fe3f41d688254cfaec08 (diff) | |
| download | git-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
| -rwxr-xr-x | t/t7001-mv.sh | 4 |
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 && |