From: Eric Sunshine <sunshine@sunshineco.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>, Josh Soref <jsoref@gmail.com>,
Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH v4 2/2] merge: fix swapped "up to date" message components
Date: Mon, 3 May 2021 01:50:37 -0400 [thread overview]
Message-ID: <CAPig+cTf6bTpqpi2b27N2jDd_cS26VC6M6GcTRB_FSAn3m5CsQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqwnsg8kaf.fsf@gitster.g>
On Mon, May 3, 2021 at 1:21 AM Junio C Hamano <gitster@pobox.com> wrote:
> Eric Sunshine <sunshine@sunshineco.com> writes:
> > + if (verbosity >= 0) {
> > + if (squash)
> > + puts(_("Already up to date. (nothing to squash)"));
>
> The original scripted Porcelain may have said so, but the placement
> of full-stop in the above feels a bit strange. Should we rephrase
> it to
>
> Already up to date (nothing to squash).
>
> as we are fixing the phrasing now?
I don't have a strong opinion about it, and can go either way with it.
Josh's patch did place the full-stop after the closing parenthesis. I
can re-roll if people think that would be preferable (unless you want
to change it locally while queuing).
next prev parent reply other threads:[~2021-05-03 5:50 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
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 [this message]
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=CAPig+cTf6bTpqpi2b27N2jDd_cS26VC6M6GcTRB_FSAn3m5CsQ@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jsoref@gmail.com \
--cc=newren@gmail.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).