From: Ralf Thielow <ralf.thielow@gmail.com>
Date: Fri, 08 May 2015 17:26:16 GMT
Subject: Re: [PATCH] sequencer.c: abbreviate hashs placed in the middle of messages
Message-ID: <CAN0XMOLhkTMWDr+eOsb5H8YiC1b7Nk0OKTSfi02ocr1unwFjfw@mail.gmail.com>
In-Reply-To: <xmqqbnhvm1f5.fsf@gitster.dls.corp.google.com>

Junio C Hamano <gitster@pobox.com> wrote:

> If identifying the exact commit has value, on the other hand, we can
> rephrase it like this:
>
>         error(_("no -m option was given to pick a merge '%s'", ...));
>
> to place it not in the middle.  We can do similar rephrasing for
> other messages as well.
>
>>> -                       return error(_("Commit %s does not have parent %d"),
>>> -                               sha1_to_hex(commit->object.sha1), opts->mainline);
>
>         error(_("No parent %d for commit '%s'", opts->mainline, ...);
>
>>> -               return error(_("Mainline was specified but commit %s is not a merge."),
>>> -                       sha1_to_hex(commit->object.sha1));
>
>         error(_("-m option was given for non-merge commit '%s'", ...);

The %s can be placed to somewhere else in translations.