From: Junio C Hamano <gitster@pobox.com>
To: "Josh Soref via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Eric Sunshine <sunshine@sunshineco.com>,
Josh Soref <jsoref@gmail.com>
Subject: Re: [PATCH v3] git-merge: rewrite already up to date message
Date: Wed, 28 Apr 2021 13:04:32 +0900 [thread overview]
Message-ID: <xmqqbl9zcawf.fsf@gitster.g> (raw)
In-Reply-To: <pull.934.v3.git.1619052906768.gitgitgadget@gmail.com> (Josh Soref via GitGitGadget's message of "Thu, 22 Apr 2021 00:55:06 +0000")
"Josh Soref via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Josh Soref <jsoref@gmail.com>
>
> Usually, it is easier to read a message if it makes its primary
> point first, before giving a parenthetical note.
>
> Possible messages before include:
> ` (nothing to squash)Already up to date.
> `
> and
> `Already up to date. Yeeah!
> `
>
> After:
> `Already up to date (nothing to squash).
> `
> and
> `Already up to date.
> `
>
> Localizations now have two easy to understand translatable strings.
> (All localizations of the previous strings are broken.)
>
> Co-authored-by: Eric Sunshine <sunshine@sunshineco.com>
> Signed-off-by: Josh Soref <jsoref@gmail.com>
> ---
I am not sure why this is Co-au, and not the more usual "Helped-by".
The patch text makes sense to me.
Thanks.
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 062e91144125..f8c3d0687eaf 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -380,10 +380,14 @@ static void restore_state(const struct object_id *head,
> }
>
> /* This is called when no merge was necessary. */
> -static void finish_up_to_date(const char *msg)
> +static void finish_up_to_date(void)
> {
> - if (verbosity >= 0)
> - printf("%s%s\n", squash ? _(" (nothing to squash)") : "", msg);
> + if (verbosity >= 0) {
> + if (squash)
> + puts(_("Already up to date (nothing to squash)."));
> + else
> + puts(_("Already up to date."));
> + }
> remove_merge_branch_state(the_repository);
> }
>
> @@ -1482,7 +1486,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
> * If head can reach all the merge then we are up to date.
> * but first the most common case of merging one remote.
> */
> - finish_up_to_date(_("Already up to date."));
> + finish_up_to_date();
> goto done;
> } else if (fast_forward != FF_NO && !remoteheads->next &&
> !common->next &&
> @@ -1566,7 +1570,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
> }
> }
> if (up_to_date) {
> - finish_up_to_date(_("Already up to date. Yeeah!"));
> + finish_up_to_date();
> goto done;
> }
> }
>
> base-commit: 7a6a90c6ec48fc78c83d7090d6c1b95d8f3739c0
next prev parent reply other threads:[~2021-04-28 4:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-18 18:33 [PATCH] git-merge: move space to between strings Josh Soref via GitGitGadget
2021-04-18 19:17 ` Junio C Hamano
2021-04-21 23:22 ` [PATCH v2] git-merge: move primary point before parenthetical Josh Soref via GitGitGadget
2021-04-21 23:46 ` Eric Sunshine
2021-04-22 0:55 ` [PATCH v3] git-merge: rewrite already up to date message Josh Soref via GitGitGadget
2021-04-22 3:41 ` Eric Sunshine
2021-04-28 4:04 ` Junio C Hamano [this message]
2021-04-29 7:52 ` Junio C Hamano
2021-05-02 1:51 ` Josh Soref
2021-05-02 2:15 ` Eric Sunshine
2021-05-02 2:39 ` Junio C Hamano
2021-05-02 6:26 ` Junio C Hamano
2021-05-02 7:14 ` Eric Sunshine
2021-05-02 5:14 ` [PATCH v4 0/2] normalize & fix merge "up to date" messages Eric Sunshine
2021-05-02 5:14 ` [PATCH v4 1/2] merge(s): apply consistent punctuation to " Eric Sunshine
2021-05-02 5:14 ` [PATCH v4 2/2] merge: fix swapped "up to date" message components Eric Sunshine
2021-05-03 5:21 ` Junio C Hamano
2021-05-03 5:50 ` Eric Sunshine
2021-05-03 6:28 ` 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=xmqqbl9zcawf.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jsoref@gmail.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).