{"thread":{"id":"38314","subject":"[PATCH] show-branch: Indentation for show-branch usage","startedAt":"2015-01-08T18:08:36Z","lastAt":"2015-01-08T20:27:01Z","messageCount":3,"participants":["Alexander Kuleshov","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"254472","messageId":"1420740516-20836-1-git-send-email-kuleshovmail@gmail.com","threadId":"38314","inReplyTo":null,"subject":"[PATCH] show-branch: Indentation for show-branch usage","fromName":"Alexander Kuleshov","fromEmail":"kuleshovmail@gmail.com","sentAt":"2015-01-08T18:08:36Z","receivedAt":"2015-01-08T18:08:36Z","isPatch":true,"sender":{"key":"kuleshovmail@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2699235?v=4"},"body":"Signed-off-by: Alexander Kuleshov \n---\n builtin/show-branch.c | 5 ++++-\n 1 file changed, 4 insertions(+), 1 deletion(-)\n\ndiff --git a/builtin/show-branch.c b/builtin/show-branch.c\nindex 270e39c..2e60107 100644\n--- a/builtin/show-branch.c\n+++ b/builtin/show-branch.c\n@@ -6,7 +6,10 @@\n #include \"parse-options.h\"\n \n static const char* show_branch_usage[] = {\n- N_(\"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color[=] | --no-color] [--sparse] [--more= | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [( | )...]\"),\n+ N_(\"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\\\n+ [--current] [--color[=] | --no-color] [--sparse]\\n\\\n+ [--more= | --list | --independent | --merge-base]\\n\\\n+ [--no-name | --sha1-name] [--topics] [( | )...]\"),\n N_(\"git show-branch (-g|--reflog)[=[,]] [--list] []\"),\n NULL\n };\n-- \n2.2.1.268.g1e6f5b2.dirty\n"},{"id":"254486","messageId":"xmqqsifldone.fsf@gitster.dls.corp.google.com","threadId":"38314","inReplyTo":"1420740516-20836-1-git-send-email-kuleshovmail@gmail.com","subject":"Re: [PATCH] show-branch: Indentation for show-branch usage","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-01-08T20:05:09Z","receivedAt":"2015-01-08T20:05:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alexander Kuleshov writes:\n\n> Signed-off-by: Alexander Kuleshov \n> ---\n\ns/Indentation for/line-wrap/, perhaps?\n\nWhat the patch wants to do makes sense to me, but I haven't seen a\nlong multi-line string, each lines in which is terminated with \"\\n\\\"\nin the source, fed to N_() macro anywhere else in the existing\ncodebase, which makes me a bit nervous.\n\nWould writing it this way instead, i.e. making it more obvious where\neach line begins and how long the indentation of subsequent lines are,\nalso work?\n\n\tN_(\"git show-branch [-a|--all] ...\\n\"\n \" [--current] [--color[=]] ...\\n\"\n ...\n \" [--no-name ...\");\n\nOr does it break N_() macro?\n\nThanks.\n\n\n> builtin/show-branch.c | 5 ++++-\n> 1 file changed, 4 insertions(+), 1 deletion(-)\n>\n> diff --git a/builtin/show-branch.c b/builtin/show-branch.c\n> index 270e39c..2e60107 100644\n> --- a/builtin/show-branch.c\n> +++ b/builtin/show-branch.c\n> @@ -6,7 +6,10 @@\n> #include \"parse-options.h\"\n> \n> static const char* show_branch_usage[] = {\n> - N_(\"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color[=] | --no-color] [--sparse] [--more= | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [( | )...]\"),\n> + N_(\"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\\\n> + [--current] [--color[=] | --no-color] [--sparse]\\n\\\n> + [--more= | --list | --independent | --merge-base]\\n\\\n> + [--no-name | --sha1-name] [--topics] [( | )...]\"),\n> N_(\"git show-branch (-g|--reflog)[=[,]] [--list] []\"),\n> NULL\n> };\n"},{"id":"254489","messageId":"CANCZXo6MvQ1EHXg18P1GZ9Vov3si780Jeh5oLdAdBju-XTnavw@mail.gmail.com","threadId":"38314","inReplyTo":"xmqqsifldone.fsf@gitster.dls.corp.google.com","subject":"Re: [PATCH] show-branch: Indentation for show-branch usage","fromName":"Alexander Kuleshov","fromEmail":"kuleshovmail@gmail.com","sentAt":"2015-01-08T20:27:01Z","receivedAt":"2015-01-08T20:27:01Z","isPatch":true,"sender":{"key":"kuleshovmail@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2699235?v=4"},"body":"No it doesn't breaks N_ macro. Will resend the patch.\n\n2015-01-09 2:05 GMT+06:00 Junio C Hamano :\n> Alexander Kuleshov writes:\n>\n>> Signed-off-by: Alexander Kuleshov \n>> ---\n>\n> s/Indentation for/line-wrap/, perhaps?\n>\n> What the patch wants to do makes sense to me, but I haven't seen a\n> long multi-line string, each lines in which is terminated with \"\\n\\\"\n> in the source, fed to N_() macro anywhere else in the existing\n> codebase, which makes me a bit nervous.\n>\n> Would writing it this way instead, i.e. making it more obvious where\n> each line begins and how long the indentation of subsequent lines are,\n> also work?\n>\n> N_(\"git show-branch [-a|--all] ...\\n\"\n> \" [--current] [--color[=]] ...\\n\"\n> ...\n> \" [--no-name ...\");\n>\n> Or does it break N_() macro?\n>\n> Thanks.\n>\n>\n>> builtin/show-branch.c | 5 ++++-\n>> 1 file changed, 4 insertions(+), 1 deletion(-)\n>>\n>> diff --git a/builtin/show-branch.c b/builtin/show-branch.c\n>> index 270e39c..2e60107 100644\n>> --- a/builtin/show-branch.c\n>> +++ b/builtin/show-branch.c\n>> @@ -6,7 +6,10 @@\n>> #include \"parse-options.h\"\n>>\n>> static const char* show_branch_usage[] = {\n>> - N_(\"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color[=] | --no-color] [--sparse] [--more= | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [( | )...]\"),\n>> + N_(\"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\\\n>> + [--current] [--color[=] | --no-color] [--sparse]\\n\\\n>> + [--more= | --list | --independent | --merge-base]\\n\\\n>> + [--no-name | --sha1-name] [--topics] [( | )...]\"),\n>> N_(\"git show-branch (-g|--reflog)[=[,]] [--list] []\"),\n>> NULL\n>> };\n\n\n\n-- \n_________________________\n0xAX\n"}]}