[PATCH] t6036: avoid "cp -a"
- From
Carlo Marcelo Arenas Belón <carenas@gmail.com>
- Date
- Dec 1, 2018, 02:52 UTC
- Message-ID
- <20181201025212.54244-1-carenas@gmail.com>
b8cd1bb713 ("t6036, t6043: increase code coverage for file collision handling", 2018-11-07) uses this GNU extension that is not available in a POSIX complaint cp; use cp -R instead
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> --- to be applied on top of en/merge-path-collision for next
t/t6036-recursive-corner-cases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index b7488b00c0..fdb120d0dc 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -1631,7 +1631,7 @@ test_expect_success 'check nested conflicts' ' # Compare m to expected contents >empty && - cp -a m_stage_2 expected_final_m && + cp -R m_stage_2 expected_final_m && test_must_fail git merge-file --diff3 \ -L "HEAD" \ -L "merged common ancestors" \
-- 2.20.0.rc1.6.ga1598010f