From: Thomas Schneider <thosch97@gmail.com>
To: git@vger.kernel.org
Cc: Thomas Schneider <thosch97@gmail.com>
Subject: [PATCH] checkout: Say “it” instead of “them” for one commit
Date: Wed, 1 Apr 2015 19:38:00 +0200 [thread overview]
Message-ID: <1427909880-9846-1-git-send-email-thosch97@gmail.com> (raw)
When detached and checking out a branch again, git checkout warns about
commit(s) that might get lost. It used to say “If you want to keep them
[…]” even for only one commit.
Signed-off-by: Thomas Schneider <thosch97@gmail.com>
---
builtin/checkout.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3e141fc..4aad49a 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -743,10 +743,17 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
if (advice_detached_head)
fprintf(stderr,
- _(
+ Q_(
+ /* The singular version */
+ "If you want to keep it by creating a new branch, "
+ "this may be a good time\nto do so with:\n\n"
+ " git branch <new-branch-name> %s\n\n",
+ /* The plural version */
"If you want to keep them by creating a new branch, "
"this may be a good time\nto do so with:\n\n"
- " git branch <new-branch-name> %s\n\n"),
+ " git branch <new-branch-name> %s\n\n",
+ /* Give ngettext() the count */
+ lost),
find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
}
--
2.1.0
next reply other threads:[~2015-04-01 17:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-01 17:38 Thomas Schneider [this message]
2015-04-01 19:43 ` [PATCH] checkout: Say “it” instead of “them” for one commit Jonathan Nieder
2015-04-02 23:14 ` Thomas Schneider
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427909880-9846-1-git-send-email-thosch97@gmail.com \
--to=thosch97@gmail.com \
--cc=git@vger.kernel.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.