threads / patch / 38987

patchstandardize usage strings that were missed the first time

Subject: [PATCH] standardize usage strings that were missed the first time

## tl;dr

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

replies: 3people: 2as markdown or json

Alex Henrie· Apr 2, 2015, 21:26 UTC · lore

This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
 builtin/blame.c | 2 +-
 builtin/log.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Show changes to 2 files +2 −2

builtin/blame.c, builtin/log.c

diff --git a/builtin/blame.c b/builtin/blame.c
index 06484c2..0b2f4ed 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -27,7 +27,7 @@
 #include "line-range.h"
 #include "line-log.h"
 
-static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] file");
+static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
 
 static const char *blame_opt_usage[] = {
 	blame_usage,
diff --git a/builtin/log.c b/builtin/log.c
index dd8f3fc..4c4e6be 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -38,7 +38,7 @@ static const char *fmt_patch_subject_prefix = "PATCH";
 static const char *fmt_pretty;
 
 static const char * const builtin_log_usage[] = {
-	N_("git log [<options>] [<revision range>] [[--] <path>...]"),
+	N_("git log [<options>] [<revision-range>] [[--] <path>...]"),
 	N_("git show [<options>] <object>..."),
 	NULL
 };

-- 
2.3.5

Junio C Hamano· Apr 2, 2015, 21:56 UTC · re: Alex Henrie · lore

Re: [PATCH] standardize usage strings that were missed the first time

Alex Henrie <alexhenrie24@gmail.com> writes:

> This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.
>
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---

Thanks, but please no more _("string") changes for the rest of the cycle, as that would impact i18n folks who will be starting from tagged -rc releases.

Please hold them off, and resend them after 2.4.0 final.

Thanks.

Show 30 quoted lines

>  builtin/blame.c | 2 +-
>  builtin/log.c   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/blame.c b/builtin/blame.c
> index 06484c2..0b2f4ed 100644
> --- a/builtin/blame.c
> +++ b/builtin/blame.c
> @@ -27,7 +27,7 @@
>  #include "line-range.h"
>  #include "line-log.h"
>  
> -static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] file");
> +static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
>  
>  static const char *blame_opt_usage[] = {
>  	blame_usage,
> diff --git a/builtin/log.c b/builtin/log.c
> index dd8f3fc..4c4e6be 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -38,7 +38,7 @@ static const char *fmt_patch_subject_prefix = "PATCH";
>  static const char *fmt_pretty;
>  
>  static const char * const builtin_log_usage[] = {
> -	N_("git log [<options>] [<revision range>] [[--] <path>...]"),
> +	N_("git log [<options>] [<revision-range>] [[--] <path>...]"),
>  	N_("git show [<options>] <object>..."),
>  	NULL
>  };

Alex Henrie· Apr 3, 2015, 22:47 UTC · re: Junio C Hamano · lore

Re: [PATCH] standardize usage strings that were missed the first time

2015-04-02 15:56 GMT-06:00 Junio C Hamano <gitster@pobox.com>:

Show 5 quoted lines

> Thanks, but please no more _("string") changes for the rest of the
> cycle, as that would impact i18n folks who will be starting from
> tagged -rc releases.
>
> Please hold them off, and resend them after 2.4.0 final.

I thought that during a code freeze, you held onto patches or committed them to a staging branch. But it's OK, I will resend after 2.4 final is released. Thanks for the clarification.

-Alex

Junio C Hamano· Apr 3, 2015, 23:48 UTC · re: Alex Henrie · lore

Re: [PATCH] standardize usage strings that were missed the first time

On Fri, Apr 3, 2015 at 3:47 PM, Alex Henrie <alexhenrie24@gmail.com> wrote:

Show 9 quoted lines

> 2015-04-02 15:56 GMT-06:00 Junio C Hamano <gitster@pobox.com>:
>> Thanks, but please no more _("string") changes for the rest of the
>> cycle, as that would impact i18n folks who will be starting from
>> tagged -rc releases.
>>
>> Please hold them off, and resend them after 2.4.0 final.
>
> I thought that during a code freeze, you held onto patches or
> committed them to a staging branch.

Yes, but that is done as time-permits basis, and it is much more efficient to spread the load of remembering the topics that are needed in future ;-)

Thanks.