Browse Source

Merge branch 'km/avoid-cp-a'

Portability fix.

* km/avoid-cp-a:
  test: fix t7001 cp to use POSIX options
maint
Junio C Hamano 11 years ago
parent
commit
51bb8adbc9
  1. 4
      t/t7001-mv.sh

4
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 && cd sub &&
rm -f .git && 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 GIT_WORK_TREE=. git config --unset core.worktree
) && ) &&
mkdir mod && mkdir mod &&
@ -331,7 +331,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
( (
cd sub && cd sub &&
rm -f .git && 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 GIT_WORK_TREE=. git config --unset core.worktree
) && ) &&
mkdir mod && mkdir mod &&

Loading…
Cancel
Save