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.
> * nd/per-worktree-ref-iteration (2018-11-05) 9 commits
> (merged to 'next' on 2018-11-06 at 53803cedf3)
> + git-worktree.txt: correct linkgit command name
> (merged to 'next' on 2018-11-03 at 4cbe49a704)
> + reflog expire: cover reflog from all worktrees
> + fsck: check HEAD and reflog from other worktrees
> + fsck: move fsck_head_link() to get_default_heads() to avoid some globals
> + revision.c: better error reporting on ref from different worktrees
> + revision.c: correct a parameter name
> + refs: new ref types to make per-worktree refs visible to all worktrees
> + Add a place for (not) sharing stuff between worktrees
> + refs.c: indent with tabs, not spaces
>
> The code to traverse objects for reachability, used to decide what
> objects are unreferenced and expendable, have been taught to also
> consider per-worktree refs of other worktrees as starting points to
> prevent data loss.
>
> Will merge to 'master'.
