{"thread":{"id":"40585","subject":"[PATCH] Fix worktree usage message","startedAt":"2015-10-18T11:02:24Z","lastAt":"2015-10-19T06:35:54Z","messageCount":6,"participants":["Sidhant Sharma","Kevin Daudt","Eric Sunshine","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"271870","messageId":"1445166144-29509-1-git-send-email-tigerkid001@gmail.com","threadId":"40585","inReplyTo":null,"subject":"[PATCH] Fix worktree usage message","fromName":"Sidhant Sharma","fromEmail":"tigerkid001@gmail.com","sentAt":"2015-10-18T11:02:24Z","receivedAt":"2015-10-18T11:02:24Z","isPatch":true,"sender":{"key":"tigerkid001@gmail.com","avatar":"https://avatars.githubusercontent.com/u/7801881?v=4"},"body":"Mark as optional in worktree command line usage.\n\nHi, just starting out with development for Git. Found this one super easy to fix,\nso made a patch :)\n\n---\n builtin/worktree.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/worktree.c b/builtin/worktree.c\nindex 71bb770..33d2d37 100644\n--- a/builtin/worktree.c\n+++ b/builtin/worktree.c\n@@ -10,7 +10,7 @@\n #include \"refs.h\"\n\n static const char * const worktree_usage[] = {\n-\tN_(\"git worktree add [] \"),\n+\tN_(\"git worktree add [] []\"),\n \tN_(\"git worktree prune []\"),\n \tNULL\n };\n--\n2.6.2\n"},{"id":"271872","messageId":"20151018113902.GA12622@ikke.info","threadId":"40585","inReplyTo":"1445166144-29509-1-git-send-email-tigerkid001@gmail.com","subject":"Re: [PATCH] Fix worktree usage message","fromName":"Kevin Daudt","fromEmail":"me@ikke.info","sentAt":"2015-10-18T11:39:02Z","receivedAt":"2015-10-18T11:39:02Z","isPatch":true,"sender":{"key":"me@ikke.info","avatar":"https://avatars.githubusercontent.com/u/135698?v=4"},"body":"\n\nOn Sun, Oct 18, 2015 at 04:32:24PM +0530, Sidhant Sharma wrote:\n> Mark as optional in worktree command line usage.\n\nThank you for the patch. \n\nCan you also explain why you mark it as optional in the commit message?\nThat way it's clear why this patch is needed.\n\n> \n> Hi, just starting out with development for Git. Found this one super easy to fix,\n> so made a patch :)\n\nThese kind of comments don't belong in the commit message. You could add\nthem below the first three ---. That way, they will not be part of the\ncommit history.\n\n\n> \n> ---\n> builtin/worktree.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/builtin/worktree.c b/builtin/worktree.c\n> index 71bb770..33d2d37 100644\n> --- a/builtin/worktree.c\n> +++ b/builtin/worktree.c\n> @@ -10,7 +10,7 @@\n> #include \"refs.h\"\n> \n> static const char * const worktree_usage[] = {\n> -\tN_(\"git worktree add [] \"),\n> +\tN_(\"git worktree add [] []\"),\n> \tN_(\"git worktree prune []\"),\n> \tNULL\n> };\n> --\n> 2.6.2\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n"},{"id":"271873","messageId":"1445170530-31573-1-git-send-email-tigerkid001@gmail.com","threadId":"40585","inReplyTo":"20151018113902.GA12622@ikke.info","subject":"[PATCH] Fix worktree usage message","fromName":"Sidhant Sharma","fromEmail":"tigerkid001@gmail.com","sentAt":"2015-10-18T12:15:30Z","receivedAt":"2015-10-18T12:15:30Z","isPatch":true,"sender":{"key":"tigerkid001@gmail.com","avatar":"https://avatars.githubusercontent.com/u/7801881?v=4"},"body":"Mark optional in worktree command line usage to maintain consistency with man pages.\n\nReported-by: ch3cooli@gmail.com\n\nSigned-off-by: Sidhant Sharma \n---\n\n It was reported here: http://marc.info/?l=git&m=144514145804787&w=2\n\n builtin/worktree.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/worktree.c b/builtin/worktree.c\nindex 71bb770..33d2d37 100644\n--- a/builtin/worktree.c\n+++ b/builtin/worktree.c\n@@ -10,7 +10,7 @@\n #include \"refs.h\"\n\n static const char * const worktree_usage[] = {\n-\tN_(\"git worktree add [] \"),\n+\tN_(\"git worktree add [] []\"),\n \tN_(\"git worktree prune []\"),\n \tNULL\n };\n--\n2.6.2\n"},{"id":"271877","messageId":"CAPig+cRXq9qonwPpWQdnrFkJgQQW0zDokXQhSvw5n07d7OpqdQ@mail.gmail.com","threadId":"40585","inReplyTo":"1445170530-31573-1-git-send-email-tigerkid001@gmail.com","subject":"Re: [PATCH] Fix worktree usage message","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-10-18T16:51:47Z","receivedAt":"2015-10-18T16:51:47Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Sun, Oct 18, 2015 at 8:15 AM, Sidhant Sharma wrote:\n> Mark optional in worktree command line usage to maintain consistency with man pages.\n\nThanks for the patch. To clarify that it is the in-code usage string\nwhich is incorrect, rather than the man page, how about something like\nthe following as commit message instead?\n\n worktree: usage: denote as optional with 'add'\n\n Although 1eb07d8 (worktree: add: auto-vivify new branch when\n is omitted, 2015-07-06) updated the documentation when\n became optional, it neglected to update the in-code\n usage message. Fix this oversight.\n\n> Reported-by: ch3cooli@gmail.com\n>\n> Signed-off-by: Sidhant Sharma \n\nCiting the reporter is a nice touch, but drop the blank line between\nit and the sign-off.\n\n> ---\n> diff --git a/builtin/worktree.c b/builtin/worktree.c\n> index 71bb770..33d2d37 100644\n> --- a/builtin/worktree.c\n> +++ b/builtin/worktree.c\n> @@ -10,7 +10,7 @@\n> #include \"refs.h\"\n>\n> static const char * const worktree_usage[] = {\n> - N_(\"git worktree add [] \"),\n> + N_(\"git worktree add [] []\"),\n> N_(\"git worktree prune []\"),\n> NULL\n> };\n> --\n> 2.6.2\n"},{"id":"271890","messageId":"1445229893-4179-1-git-send-email-tigerkid001@gmail.com","threadId":"40585","inReplyTo":"CAPig+cRXq9qonwPpWQdnrFkJgQQW0zDokXQhSvw5n07d7OpqdQ@mail.gmail.com","subject":"[PATCH] worktree: usage: denote as optional with 'add'","fromName":"Sidhant Sharma","fromEmail":"tigerkid001@gmail.com","sentAt":"2015-10-19T04:44:53Z","receivedAt":"2015-10-19T04:44:53Z","isPatch":true,"sender":{"key":"tigerkid001@gmail.com","avatar":"https://avatars.githubusercontent.com/u/7801881?v=4"},"body":"Although 1eb07d8 (worktree: add: auto-vivify new branch when\n is omitted, 2015-07-06) updated the documentation when\n became optional, it neglected to update the in-code\nusage message. Fix this oversight.\n\nReported-by: ch3cooli@gmail.com\nSigned-off-by: Sidhant Sharma \n---\n builtin/worktree.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/worktree.c b/builtin/worktree.c\nindex 71bb770..33d2d37 100644\n--- a/builtin/worktree.c\n+++ b/builtin/worktree.c\n@@ -10,7 +10,7 @@\n #include \"refs.h\"\n\n static const char * const worktree_usage[] = {\n-\tN_(\"git worktree add [] \"),\n+\tN_(\"git worktree add [] []\"),\n \tN_(\"git worktree prune []\"),\n \tNULL\n };\n--\n2.6.2\n"},{"id":"271893","messageId":"xmqqr3kr9xh1.fsf@gitster.mtv.corp.google.com","threadId":"40585","inReplyTo":"1445229893-4179-1-git-send-email-tigerkid001@gmail.com","subject":"Re: [PATCH] worktree: usage: denote as optional with 'add'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-10-19T06:35:54Z","receivedAt":"2015-10-19T06:35:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sidhant Sharma writes:\n\n> Although 1eb07d8 (worktree: add: auto-vivify new branch when\n> is omitted, 2015-07-06) updated the documentation when\n> became optional, it neglected to update the in-code\n> usage message. Fix this oversight.\n>\n> Reported-by: ch3cooli@gmail.com\n> Signed-off-by: Sidhant Sharma \n> ---\n\nThanks.\n\nI'll add \"Helped-by: Eric Sunshine \" and\nqueue.\n\n> builtin/worktree.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/builtin/worktree.c b/builtin/worktree.c\n> index 71bb770..33d2d37 100644\n> --- a/builtin/worktree.c\n> +++ b/builtin/worktree.c\n> @@ -10,7 +10,7 @@\n> #include \"refs.h\"\n>\n> static const char * const worktree_usage[] = {\n> -\tN_(\"git worktree add [] \"),\n> +\tN_(\"git worktree add [] []\"),\n> \tN_(\"git worktree prune []\"),\n> \tNULL\n> };\n> --\n> 2.6.2\n"}]}