Skip to content

Commit cc4cb09

Browse files
carenasgitster
authored andcommitted
t6036: avoid non-portable "cp -a"
b8cd1bb ("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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 80cee6e commit cc4cb09

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t6036-recursive-corner-cases.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1631,7 +1631,7 @@ test_expect_success 'check nested conflicts' '
16311631
16321632
# Compare m to expected contents
16331633
>empty &&
1634-
cp -a m_stage_2 expected_final_m &&
1634+
cp m_stage_2 expected_final_m &&
16351635
test_must_fail git merge-file --diff3 \
16361636
-L "HEAD" \
16371637
-L "merged common ancestors" \

0 commit comments

Comments
 (0)