summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-17 17:28:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-10-17 17:28:48 (GMT)
commitc15fadab65907e7fa1ae3a0dd5e05b722fd1f235 (patch)
tree6576be6231027e0a0ce1cc27c00625552c944c3c
parent530d71011e358a43e8f8489e320081f49fe96c4f (diff)
parentd4a7ffaae3fa3302a73e00dab01b80c4bfd17cdb (diff)
downloadgit-c15fadab65907e7fa1ae3a0dd5e05b722fd1f235.zip
git-c15fadab65907e7fa1ae3a0dd5e05b722fd1f235.tar.gz
git-c15fadab65907e7fa1ae3a0dd5e05b722fd1f235.tar.bz2
Merge branch 'bw/cp-a-is-gnuism' into maint
* bw/cp-a-is-gnuism: tests: "cp -a" is a GNUism
-rwxr-xr-xt/t5400-send-pack.sh2
-rwxr-xr-xt/t5550-http-fetch.sh2
-rwxr-xr-xt/t5800-remote-helpers.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 250c720..418f515 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -159,7 +159,7 @@ test_expect_success 'receive-pack runs auto-gc in remote repo' '
git commit -a -m "Second commit" &&
git repack
) &&
- cp -a parent child &&
+ cp -R parent child &&
(
# Set the child to auto-pack if more than one pack exists
cd child &&
diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh
index 16ef041..80d20c8 100755
--- a/t/t5550-http-fetch.sh
+++ b/t/t5550-http-fetch.sh
@@ -22,7 +22,7 @@ test_expect_success 'setup repository' '
'
test_expect_success 'create http-accessible bare repository with loose objects' '
- cp -a .git "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+ cp -R .git "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
git config core.bare true &&
mkdir -p hooks &&
diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh
index 5702334..e7dc668 100755
--- a/t/t5800-remote-helpers.sh
+++ b/t/t5800-remote-helpers.sh
@@ -76,7 +76,7 @@ test_expect_success 'pushing to local repo' '
# git-remote-testgit, but is too slow to leave in for general use.
: test_expect_success 'racily pushing to local repo' '
test_when_finished "rm -rf server2 localclone2" &&
- cp -a server server2 &&
+ cp -R server server2 &&
git clone "testgit::${PWD}/server2" localclone2 &&
(cd localclone2 &&
echo content >>file &&