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

Re: [PATCH] remote: use plural-only message for diverged branch status

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 14, 2026, 18:38 UTC
Message-ID
<xmqqtsuiuugy.fsf@gitster.g>
In-Reply-To
<xmqqqzpmwdyi.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 17 quoted lines
> "Harald Nordgren via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> From: Harald Nordgren <haraldnordgren@gmail.com>
>>
>> Drop Q_() singular form and use _() with the plural string only.
>
> I know the commit title talks about plural-only, but please make
> sure that the body of the log message carries all the necessary
> information to justify the change standalone.  "In the else clause,
> both ours and theirs are positive integers so ours+theirs must be at
> least 2, hence there is no need to prepare singular and plural
> variants of the message", or something to that effect, perhaps.
>
> The patch text and the reasoning behind it does sound familiar and I
> vaguely recall discussing about it ;-)
>
> Thanks.
I queued the patch, tentatively with this rewritten message:
    remote: don't use Q_() when it is not needed
    In this code path, both ours and theirs are already known to be
    positive integers, so ours + theirs will always be plural, never
    using the first variant given to Q_().
    Just use _() with the plural string only.
    Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thanks.
Previous: Junio C HamanoNext: Phillip Wood
Message 4 of 9 in “remote: use plural-only message for diverged branch status”
  1. remote: use plural-only message for diverged branch statusHarald Nordgren via GitGitGadget, Mar 14, 2026
  2. Harald NordgrenMar 14, 2026
  3. Junio C HamanoMar 14, 2026
  4. Junio C HamanoMar 14, 2026
  5. Phillip WoodMar 14, 2026
  6. Junio C HamanoMar 15, 2026
  7. Phillip WoodMar 16, 2026
  8. Junio C HamanoMar 16, 2026
  9. Kaartic SivaraamMar 25, 2026

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.