Hi,
Thanks for the patch!
On Fri, Nov 30, 2018 at 6:52 PM Carlo Marcelo Arenas Belón
<carenas@xxxxxxxxx> wrote:
>
> 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
This is an extraordinarily long line; can you rewrap at around 72 characters?
> cp; use cp -R instead
>
> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx>
> ---
> 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
Oops. Thanks for catching. To be honest, we don't even need -a, -R,
etc. -- it was just a habit for me to add -a after cp. A simple cp
would do, though what you have here is fine too.
