t6036: avoid non-portable "cp -a"
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. In this particular case, there is no need to use the option, as it is just copying a single file to create another file. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Carlo Marcelo Arenas Belón committed
Nov 30, 2018 at 18:52 UTC
cc4cb0902c2e4f9bc003b52f33da8fcb6020f649
1 file changed
+1
-1
t/t6036-recursive-corner-cases.sh
+1
-1
@@ -1631,7 +1631,7 @@ test_expect_success 'check nested conflicts' '
1631
1632
# Compare m to expected contents
1633
>empty &&
1634
- cp -a m_stage_2 expected_final_m &&
1634
+ cp m_stage_2 expected_final_m &&
1635
test_must_fail git merge-file --diff3 \
1636
-L "HEAD" \
1637
-L "merged common ancestors" \