On Mon, Apr 11, 2011 at 00:55, Jens Lehmann <Jens.Lehmann@xxxxxx> wrote:
> Am 10.04.2011 20:52, schrieb Ãvar ArnfjÃrà Bjarmason:
>> On Wed, Apr 6, 2011 at 22:04, Junio C Hamano <gitster@xxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html