From: Josh Soref <jsoref@gmail.com>
To: "gitgitgadget/git"
<reply+AAQFMLC42KHLQTLKSC5H3XV6TILQ3EVBNHHDGQXBRY@reply.github.com>,
git@vger.kernel.org, Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [gitgitgadget/git] git-merge: rewrite already up to date message (#934)
Date: Sun, 2 May 2021 01:49:33 -0400 [thread overview]
Message-ID: <CACZqfqA8u8cRM5xSdnArUW7tGOJX9dVO41FsmQU4-d2NyiNCiA@mail.gmail.com> (raw)
In-Reply-To: <gitgitgadget/git/pull/934/c830744540@github.com>
Eric Sunshine wrote:
> 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 parent reply other threads:[~2021-05-02 5:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <gitgitgadget/git/pull/934@github.com>
[not found] ` <gitgitgadget/git/pull/934/c830744540@github.com>
2021-05-02 5:49 ` Josh Soref [this message]
2021-05-02 6:52 ` [gitgitgadget/git] git-merge: rewrite already up to date message (#934) Eric Sunshine
2021-05-02 23:19 ` Eric Sunshine
2021-05-03 1:13 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACZqfqA8u8cRM5xSdnArUW7tGOJX9dVO41FsmQU4-d2NyiNCiA@mail.gmail.com \
--to=jsoref@gmail.com \
--cc=git@vger.kernel.org \
--cc=reply+AAQFMLC42KHLQTLKSC5H3XV6TILQ3EVBNHHDGQXBRY@reply.github.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).