kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2014-05-08 09:59:41 -07:00
parent 0bc85abb7a 00764ca10e
commit 73edc54e90
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t7001-mv.sh
View File

@ -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 &&