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

From: Elijah Newren <newren@gmail.com>
Date: Aug 8, 2010, 20:17 UTC
Message-ID: <AANLkTimsfcSB7GMcNnZSBiwH4kwZeEazo5svW96_Nf9J@mail.gmail.com>
In-Reply-To: <AANLkTikhsFfCfmR2V8iSRvU73B5yW=_kqJAEfAGgxpLY@mail.gmail.com>

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>

Show 5 quoted lines

>> +        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?

<snip>

Show 9 quoted lines

>> +test_expect_success 'setup for avoiding reapplying old patches' '
>> +       (cd dst &&
>> +        (git rebase --abort || true) &&
>
> If you're ignoring the git rebase --abort return value:
>
>  (cd dst &&
>    git rebase --abort;
>    git reset ...)

Makes sense; I'll do that.