summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-05-27 12:36:57 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-05-27 12:36:57 +0900
commit2f0ca413491cff630ed4fc8427b2e87201674b7b (patch)
tree1d3b1b8c5e6759ab1189ebbb43e4a6ad8fe33c96
parentMerge branch 'ab/send-email-inline-hooks-path' (diff)
parentt2080: fix cp invocation to copy symlinks instead of following them (diff)
downloadtgif-2f0ca413491cff630ed4fc8427b2e87201674b7b.tar.xz
Merge branch 'mt/t2080-cp-symlink-fix'
Test portability fix. * mt/t2080-cp-symlink-fix: t2080: fix cp invocation to copy symlinks instead of following them
-rwxr-xr-xt/t2080-parallel-checkout-basics.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
index 7087818550..3e0f8c675f 100755
--- a/t/t2080-parallel-checkout-basics.sh
+++ b/t/t2080-parallel-checkout-basics.sh
@@ -114,7 +114,7 @@ do
test_expect_success "$mode checkout" '
repo=various_$mode &&
- cp -R various $repo &&
+ cp -R -P various $repo &&
# The just copied files have more recent timestamps than their
# associated index entries. So refresh the cached timestamps