diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-16 13:38:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-16 13:38:55 -0700 |
| commit | 51bb8adbc9d59ae042eb9134e5218240a1532bea (patch) | |
| tree | b42782c9a60e77da63f7883c2c032043d57e1efd | |
| parent | 5b713d990d5dfea96ec76d30d77b23cc2197bcd0 (diff) | |
| parent | 00764ca10e0b55b21853fe3f41d688254cfaec08 (diff) | |
| download | git-51bb8adbc9d59ae042eb9134e5218240a1532bea.tar.gz | |
Merge branch 'km/avoid-cp-a'
Portability fix.
* 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 34fb1afbb3..54d78079e8 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 && |