Re: [PATCH] show-branch: Indentation for show-branch usage

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 8, 2015, 20:05 UTC
Message-ID: <xmqqsifldone.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1420740516-20836-1-git-send-email-kuleshovmail@gmail.com>

Alexander Kuleshov <kuleshovmail@gmail.com> writes:

> Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
> ---

s/Indentation for/line-wrap/, perhaps?

What the patch wants to do makes sense to me, but I haven't seen a long multi-line string, each lines in which is terminated with "\n\" in the source, fed to N_() macro anywhere else in the existing codebase, which makes me a bit nervous.

Would writing it this way instead, i.e. making it more obvious where each line begins and how long the indentation of subsequent lines are, also work?

	N_("git show-branch [-a|--all] ...\n"
           "                [--current] [--color[=<when>]] ...\n"
           ...
           "                [--no-name ...");

Or does it break N_() macro?

Thanks.

Show 19 quoted lines

>  builtin/show-branch.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/show-branch.c b/builtin/show-branch.c
> index 270e39c..2e60107 100644
> --- a/builtin/show-branch.c
> +++ b/builtin/show-branch.c
> @@ -6,7 +6,10 @@
>  #include "parse-options.h"
>  
>  static const char* show_branch_usage[] = {
> -    N_("git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
> +    N_("git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n\
> +                       [--current] [--color[=<when>] | --no-color] [--sparse]\n\
> +                       [--more=<n> | --list | --independent | --merge-base]\n\
> +                       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
>      N_("git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"),
>      NULL
>  };