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

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

[Alex Henrie]

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

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

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

[Junio C Hamano]

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.

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

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

[Alex Henrie]

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. But it's OK, I will resend after
2.4 final is released. Thanks for the clarification.

-Alex

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

[Junio C Hamano]

On Fri, Apr 3, 2015 at 3:47 PM, Alex Henrie <alexhenrie24@gmail.com> wrote:
> 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.

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

[Alex Henrie]

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

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

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

[Junio C Hamano]

Alex Henrie <alexhenrie24@gmail.com> writes:

> This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.

Please do not force the reader to type "git show 9c9b4f2".

>
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
>  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
>  };

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

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

> Alex Henrie <alexhenrie24@gmail.com> writes:
>
>> This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.
>
> Please do not force the reader to type "git show 9c9b4f2".

Here is my attempt.

commit ce41720cad79d858f09ebfc88cf84a4b152645c7
Author: Alex Henrie <alexhenrie24@gmail.com>
Date:   Thu Apr 2 15:26:56 2015 -0600

    blame, log: format usage strings similarly to those in documentation
    
    Earlier, 9c9b4f2f (standardize usage info string format, 2015-01-13)
    tried to make usage-string in line with the documentation by
    
        - Placing angle brackets around fill-in-the-blank parameters
        - Putting dashes in multiword parameter names
        - Adding spaces to [-f|--foobar] to make [-f | --foobar]
        - Replacing <foobar>* with [<foobar>...]
    
    but it missed a few places.
    
    Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

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

[Alex Henrie]

2015-05-03 17:59 GMT-06:00 Junio C Hamano <gitster@pobox.com>:
> Here is my attempt.
>
> commit ce41720cad79d858f09ebfc88cf84a4b152645c7
> Author: Alex Henrie <alexhenrie24@gmail.com>
> Date:   Thu Apr 2 15:26:56 2015 -0600
>
>     blame, log: format usage strings similarly to those in documentation
>
>     Earlier, 9c9b4f2f (standardize usage info string format, 2015-01-13)
>     tried to make usage-string in line with the documentation by
>
>         - Placing angle brackets around fill-in-the-blank parameters
>         - Putting dashes in multiword parameter names
>         - Adding spaces to [-f|--foobar] to make [-f | --foobar]
>         - Replacing <foobar>* with [<foobar>...]
>
>     but it missed a few places.
>
>     Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
>     Signed-off-by: Junio C Hamano <gitster@pobox.com>

Looks great, thank you.

-Alex

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

[Junio C Hamano]

Alex Henrie <alexhenrie24@gmail.com> writes:

> 2015-05-03 17:59 GMT-06:00 Junio C Hamano <gitster@pobox.com>:
>> Here is my attempt.
>> ...
>
> Looks great, thank you.
>
> -Alex

Thanks.