git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] sequencer.c: abbreviate hashs placed in the middle of messages

From
Ralf Thielow <ralf.thielow@gmail.com>
Date
May 8, 2015, 17:26 UTC
Message-ID
<CAN0XMOLhkTMWDr+eOsb5H8YiC1b7Nk0OKTSfi02ocr1unwFjfw@mail.gmail.com>
In-Reply-To
<xmqqbnhvm1f5.fsf@gitster.dls.corp.google.com>
Junio C Hamano <gitster@pobox.com> wrote:
Show 17 quoted lines
> 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.
Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 14 in “sequencer.c: abbreviate hashs placed in the middle of messages”
  1. sequencer.c: abbreviate hashs placed in the middle of messagesRalf Thielow, May 8, 2015
  2. Eric SunshineMay 8, 2015
  3. Ralf ThielowMay 8, 2015
  4. Junio C HamanoMay 8, 2015
  5. Ralf ThielowMay 8, 2015
  6. Junio C HamanoMay 8, 2015
  7. Ralf ThielowMay 8, 2015
  8. Junio C HamanoMay 8, 2015
  9. Ralf ThielowMay 8, 2015
  10. Junio C HamanoMay 8, 2015
  11. Ralf ThielowMay 8, 2015
  12. Matthieu MoyMay 10, 2015
  13. Junio C HamanoMay 10, 2015
  14. Matthieu MoyMay 10, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.