SZEDER Gábor <[email protected]> writes:
> Hang on, this test fails in the GETTEXT_POISON build.
Thanks.
> The thing is, we get the merge strategies with this piece of code in
> __git_list_merge_strategies() in master:
>
> LANG=C LC_ALL=C git merge -s help 2>&1 |
> sed -n -e '/[Aa]vailable strategies are: /,/^$/{
> # a couple of s/// commands
> }'
>
>
> and that '/[Aa]vailable strategies are: /' won't match in a
> GETTEXT_POISON-ed output, because that string is translated.
>
> I think for now (-rc phase) we should just drop this test, and in the
> future we should consider adding a 'git merge --list-strategies' option.
I'd say we should just add !GETTEXT_POISON prereq to the problematic
tests.
"git merge -s help" output under forced C locale is dependable in
the real world. It is GETTEXT_POISON that does not get this fact
right. There is no need for '--list-strat' option to make this test
pass.
