threads / patch / 38972

patchcheckout: Say “it” instead of “them” for one commit

Subject: [PATCH] checkout: Say “it” instead of “them” for one commit

## tl;dr

3 messages between Apr 1, 2015 and Apr 2, 2015. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Thomas Schneider· Apr 1, 2015, 17:38 UTC · lore

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(-)

Show changes to builtin/checkout.c +9 −2

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

Jonathan Nieder· Apr 1, 2015, 19:43 UTC · re: Thomas Schneider · lore

Re: [PATCH] checkout: Say “it” instead of “them” for one commit

Hi,

Thomas Schneider wrote:

Show 5 quoted lines

> 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>

Makes sense.

[...]

Show 20 quoted lines

> --- 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));

The comments for /* singular */, /* plural */, and /* count */ seem redundant and distracting to me, but since we have the same comments a few lines before, keeping it consistent is the right thing to do.

For what it's worth,
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

Thomas Schneider· Apr 2, 2015, 23:14 UTC · re: Jonathan Nieder · lore

Re: [PATCH] checkout: Say “it” instead of “them” for one commit

Junio –

I see you changed my commit message a bit, but some mistakes seem to have slipped in:

> checkout: call a single commit “it” instead of “th

“them” was cut off, including the trailing quotation mark. […]

> them ..."” even for only one commit.

Two quotation marks?

I always use the “right” quotation marks instead of " or ' and “…” instead of “...”, should I have used the latter ones?

Thanks, Thomas