On Wed, Nov 7, 2018 at 2:09 PM SZEDER Gábor <szeder.dev@xxxxxxxxx> wrote:
>
> On Wed, Nov 07, 2018 at 06:41:45PM +0900, Junio C Hamano wrote:
> > * nd/i18n (2018-11-06) 16 commits
> > - fsck: mark strings for translation
> > - fsck: reduce word legos to help i18n
> > - parse-options.c: mark more strings for translation
> > - parse-options.c: turn some die() to BUG()
> > - parse-options: replace opterror() with optname()
> > - repack: mark more strings for translation
> > - remote.c: mark messages for translation
> > - remote.c: turn some error() or die() to BUG()
> > - reflog: mark strings for translation
> > - read-cache.c: add missing colon separators
> > - read-cache.c: mark more strings for translation
> > - read-cache.c: turn die("internal error") to BUG()
> > - attr.c: mark more string for translation
> > - archive.c: mark more strings for translation
> > - alias.c: mark split_cmdline_strerror() strings for translation
> > - git.c: mark more strings for translation
> >
> > More _("i18n") markings.
>
> When this patch is merged into 'pu' all four tests added to
> 't1450-fsck.sh' in b29759d89a (fsck: check HEAD and reflog from other
> worktrees, 2018-10-21) as part of 'nd/per-worktree-ref-iteration'
> below fail when run with GETTEXT_POISON=y. The test suite passes in
> both of these topics on their own, even with GETTEXT_POISON, it's
> their merge that is somehow problematic.
Not surprising. The i18n series makes fsck output localized strings
and without updating grep to test_i18ngrep, new tests will fail. If
'pu' was passing before, I'm ok with just ejecting this series for
now. Then I wait for the other to land, rebase, fixup and resubmit.
--
Duy
