Re: [PATCHv2 1/2] t5520-pull: Add testcases showing spurious conflicts from git pull --rebase

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Aug 8, 2010, 20:33 UTC
Message-ID: <AANLkTinkT5nZqJW=4ufU=oVp0GjUzh-HkLky_6S5RcJo@mail.gmail.com>
In-Reply-To: <AANLkTimsfcSB7GMcNnZSBiwH4kwZeEazo5svW96_Nf9J@mail.gmail.com>

On Sun, Aug 8, 2010 at 20:17, Elijah Newren <newren@gmail.com> wrote:

Show 16 quoted lines

> Hi,
>
> Thanks for taking a look!
>
> On Sun, Aug 8, 2010 at 2:01 PM, Ævar Arnfjörð Bjarmason
> <avarab@gmail.com> wrote:
>> On Sun, Aug 8, 2010 at 19:04, Elijah Newren <newren@gmail.com> wrote:
> <snip>
>>> +        perl -pi -e s/5/43/ stuff &&
>>> +        git commit -a -m "5->43" &&
>>> +        perl -pi -e s/6/42/ stuff &&
>>
>> Please use sed so the test doesn't depend on perl being present.
>
> The original series used 'sed -i', but I found out that is apparently
> not portable.  Should I use sed + a temporary file + mv?

Yeah, a few tests do that already. E.g.:

    sed s/6/42/ <stuff >stuff.tmp &&
    mv stuff.tmp stuff

You could also just declare a dependency on perl:

    test_expect_success PERL 'setup for detecting upstreamed changes' '

But then you'd also have to use "$PERL_PATH" instead of just perl, see t9700-perl-git.sh.