From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Apr 2014 20:38:55 +0000 (-0700)
Subject: Merge branch 'km/avoid-cp-a'
X-Git-Tag: v2.0.0-rc0~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/51bb8adbc9d59ae042eb9134e5218240a1532bea?hp=5b713d990d5dfea96ec76d30d77b23cc2197bcd0

Merge branch 'km/avoid-cp-a'

Portability fix.

* km/avoid-cp-a:
test: fix t7001 cp to use POSIX options
---

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