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

Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)

From
Josh Soref <jsoref@gmail.com>
Date
May 2, 2021, 05:49 UTC
Message-ID
<CACZqfqA8u8cRM5xSdnArUW7tGOJX9dVO41FsmQU4-d2NyiNCiA@mail.gmail.com>
In-Reply-To
<gitgitgadget/git/pull/934/c830744540@github.com>
Eric Sunshine wrote:
Show 13 quoted lines
> diff --git a/notes-merge.c b/notes-merge.c
> index d2771fa3d4..321155fc87 100644
> --- a/notes-merge.c
> +++ b/notes-merge.c
> @@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o,
>   if (oideq(&remote->object.oid, base_oid)) {
>   /* Already merged; result == local commit */
>   if (o->verbosity >= 2)
> - printf("Already up to date!\n");
> + printf_ln("Already up to date.");
>   oidcpy(result_oid, &local->object.oid);
>   goto found_result;
>   }
Should this have `_(...)` decorations?
Next: Eric Sunshine
Message 1 of 4 in “Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)”
  1. Josh SorefMay 2, 2021
  2. Eric SunshineMay 2, 2021
  3. Eric SunshineMay 2, 2021
  4. Junio C HamanoMay 3, 2021

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.