Re: What's cooking in git.git (Apr 2011, #02; Wed, 6)

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Apr 11, 2011, 09:00 UTC
Message-ID: <BANLkTinRRJAvMrbUUwGTcgK+9-Bh5QATcA@mail.gmail.com>
In-Reply-To: <4DA23551.4040304@web.de>

On Mon, Apr 11, 2011 at 00:55, Jens Lehmann <Jens.Lehmann@web.de> wrote:

Show 17 quoted lines

> Am 10.04.2011 20:52, schrieb Ævar Arnfjörð Bjarmason:
>> On Wed, Apr 6, 2011 at 22:04, Junio C Hamano <gitster@pobox.com> wrote:
>>
>>> * jl/submodule-fetch-on-demand (2011-03-06) 7 commits
>>>  (merged to 'next' on 2011-03-20 at a5e452d)
>>>  + fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
>>>  + submodule update: Don't fetch when the submodule commit is already present
>>>  + fetch/pull: Don't recurse into a submodule when commits are already present
>>>  + Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
>>>  + config: teach the fetch.recurseSubmodules option the 'on-demand' value
>>>  + fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
>>>  + fetch/pull: recurse into submodules when necessary
>>
>> This series needs to be fixed to not fail tests with GETTEXT_POISON=YesPlease.
>
> Maybe something like this? Junio, do you want me to squash the changes in
> the patch series and resend it or should I send a new commit?

Sorry about the short mail yesterday, I had to take care of something.

Anyway, that looks like it'll work, but the preferred way of doing it is like it's done at the bottom of t3700-add.sh. I.e.:

test_expect_success 'git add --dry-run --ignore-missing of
non-existing file' '
    test_must_fail git add --dry-run --ignore-missing track-this
ignored-file >actual.out 2>actual.err
'

test_expect_success C_LOCALE_OUTPUT 'git add --dry-run
--ignore-missing of non-existing file output' '
    test_cmp expect.out actual.out &&
    test_cmp expect.err actual.err
'

That is, split up each test into a test that tests the functionality (i.e. exit codes) and one that tests the output.

That way we make sure that only things dependent on C locale output are skipped under non-C locales.

Sometimes that's hard, in which case it's fine to just skip the entire thing.