Re: [PATCH v4 6/8] t5520: test --rebase failure on unborn branch with index

From: Paul Tan <pyokagan@gmail.com>
Date: May 21, 2015, 08:51 UTC
Message-ID: <CACRoPnSuiN-Q0PY97bEuS5GV2pTqmLoSz-1wk2OdTo6aNsGw0A@mail.gmail.com>
In-Reply-To: <CAGZ79kbXcWiK-9_NDCERNbi-m1cPiuukZ75r6TWwoUBsnyUGiA@mail.gmail.com>

Hi,

On Tue, May 19, 2015 at 2:00 AM, Stefan Beller <sbeller@google.com> wrote:

Show 27 quoted lines

> On Mon, May 18, 2015 at 6:32 AM, Paul Tan <pyokagan@gmail.com> wrote:
>> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
>> index f991439..4d649a5 100755
>> --- a/t/t5520-pull.sh
>> +++ b/t/t5520-pull.sh
>> @@ -413,6 +413,21 @@ test_expect_success 'pull --rebase works on branch yet to be born' '
>>         test_cmp expect actual
>>  '
>>
>> +test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
>> +       test_when_finished "rm -rf empty_repo2" &&
>> +       git init empty_repo2 &&
>> +       (
>> +               cd empty_repo2 &&
>> +               echo staged-file >staged-file &&
>> +               git add staged-file &&
>> +               test "$(git ls-files)" = staged-file &&
>> +               test_must_fail git pull --rebase .. master 2>../err &&
>> +               test "$(git ls-files)" = staged-file &&
>> +               test "$(git show :staged-file)" = staged-file
>> +       ) &&
>> +       test_i18ngrep "unborn branch with changes added to the index" err
>
> So when seeing this line outside the parenthesis section, I immediately thought
> there must be a reason you put it outside. The reason is not obvious
> to me though.
> So I'd suggest to move the test_i18ngrep inside the section above.

Right. Fixed.

Regards, Paul