Re: [PATCH] t6036: avoid "cp -a"
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 1, 2018, 12:02 UTC
- Message-ID
- <xmqqk1ktjvyr.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <CABPp-BG0=bGW54eMHCiVMbU3dwccZM06qy2gzqm1CE-TUFZ2zg@mail.gmail.com>
Elijah Newren <newren@gmail.com> writes:
Show 7 quoted lines
> Thanks for the patch! > > On Fri, Nov 30, 2018 at 6:52 PM Carlo Marcelo Arenas Belón > ... > 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.
Thanks, both. I think the topic won't escape 'next' until 2.20 final, and after that we can rewind 'next', so it may be better to squash it in, but anyway...
-- >8 -- From: Carlo Marcelo Arenas Belón <carenas@gmail.com> Date: Fri, 30 Nov 2018 18:52:12 -0800 Subject: [PATCH] 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> --- 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..d23b948f27 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 m_stage_2 expected_final_m && test_must_fail git merge-file --diff3 \ -L "HEAD" \ -L "merged common ancestors" \
-- 2.20.0-rc1-10-g7068cbc4ab