mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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
This commit is contained in:
commit
73edc54e90
|
@ -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 &&
|
||||
|
|
Loading…
Reference in a new issue