{"thread":{"id":"57618","subject":"[PATCH] worktree: include repair cmd in usage","startedAt":"2022-03-25T19:27:16Z","lastAt":"2022-03-29T18:37:06Z","messageCount":9,"participants":["Des Preston via GitGitGadget","Eric Sunshine","Junio C Hamano","Desmond Preston"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"452314","messageId":"pull.1188.git.1648231504463.gitgitgadget@gmail.com","threadId":"57618","inReplyTo":null,"subject":"[PATCH] worktree: include repair cmd in usage","fromName":"Des Preston via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-03-25T18:05:04Z","receivedAt":"2022-03-25T19:27:16Z","isPatch":true,"sender":{"key":"name:Des Preston","avatar":null},"body":"From: Des Preston \n\nThe worktree repair command was not added to the usage menu for the\nworktree command. This commit adds the usage of 'worktree repair'\naccording to the existing docs.\n\nSigned-off-by: Des Preston \n---\n worktree: include repair cmd in usage\n \n I'm working on an extension for the github CLI (github.com/cli/cli) to\n make it easier to create and manage worktrees using Github info\n (github.comm/despreston/gh-worktree). I noticed there was a worktree\n command that wasn't showing up in the usage menu git worktree -h.\n \n Signed-off-by: Des Preston despreston@gmail.com\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1188%2Fdespreston%2Fworktree-usage-repair-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1188/despreston/worktree-usage-repair-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1188\n\n builtin/worktree.c | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/builtin/worktree.c b/builtin/worktree.c\nindex 2838254f7f2..8682ff4c417 100644\n--- a/builtin/worktree.c\n+++ b/builtin/worktree.c\n@@ -22,6 +22,7 @@ static const char * const worktree_usage[] = {\n \tN_(\"git worktree move \"),\n \tN_(\"git worktree prune []\"),\n \tN_(\"git worktree remove [] \"),\n+\tN_(\"git worktree repair []\"),\n \tN_(\"git worktree unlock \"),\n \tNULL\n };\n\nbase-commit: 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a\n-- \ngitgitgadget\n"},{"id":"452386","messageId":"3f823608-adf4-f717-13d8-8da6f89a9506@sunshineco.com","threadId":"57618","inReplyTo":"pull.1188.git.1648231504463.gitgitgadget@gmail.com","subject":"Re: [PATCH] worktree: include repair cmd in usage","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2022-03-25T19:55:19Z","receivedAt":"2022-03-25T20:02:54Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On 3/25/22 2:05 PM, Des Preston via GitGitGadget wrote:\n> The worktree repair command was not added to the usage menu for the\n> worktree command. This commit adds the usage of 'worktree repair'\n> according to the existing docs.\n> \n> Signed-off-by: Des Preston \n\nThanks for fixing my oversight. This certainly should have been done by \ne8e1ff24c5 (worktree: add skeleton \"repair\" command, 2020-08-27).\n\nOne minor comment below...\n\n> diff --git a/builtin/worktree.c b/builtin/worktree.c\n> @@ -22,6 +22,7 @@ static const char * const worktree_usage[] = {\n> \tN_(\"git worktree move \"),\n> \tN_(\"git worktree prune []\"),\n> \tN_(\"git worktree remove [] \"),\n> +\tN_(\"git worktree repair []\"),\n> \tN_(\"git worktree unlock \"),\n\nThe usage message should reflect the fact that `git worktree repair` can \naccept multiple paths, thus:\n\n N_(\"git worktree repair [...]\"),\n\nwhich would also make it consistent with the synopsis in \nDocumentation/worktree.txt.\n\nWith that change applied, consider this:\n\n Acked-by: Eric Sunshine \n"},{"id":"452509","messageId":"pull.1188.v2.git.1648500426.gitgitgadget@gmail.com","threadId":"57618","inReplyTo":"pull.1188.git.1648231504463.gitgitgadget@gmail.com","subject":"[PATCH v2 0/2] worktree: include repair cmd in usage","fromName":"Des Preston via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-03-28T20:47:04Z","receivedAt":"2022-03-28T20:48:21Z","isPatch":true,"sender":{"key":"name:Des Preston","avatar":null},"body":"I'm working on an extension for the github CLI (github.com/cli/cli) to make\nit easier to create and manage worktrees using Github info\n(github.comm/despreston/gh-worktree). I noticed there was a worktree command\nthat wasn't showing up in the usage menu git worktree -h.\n\nSigned-off-by: Des Preston despreston@gmail.com\n\nDes Preston (2):\n worktree: include repair cmd in usage\n worktree: accept multiple paths\n\n builtin/worktree.c | 1 +\n 1 file changed, 1 insertion(+)\n\n\nbase-commit: 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1188%2Fdespreston%2Fworktree-usage-repair-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1188/despreston/worktree-usage-repair-v2\nPull-Request: https://github.com/gitgitgadget/git/pull/1188\n\nRange-diff vs v1:\n\n 1: e0bfbfd5320 = 1: e0bfbfd5320 worktree: include repair cmd in usage\n -: ----------- > 2: 1df005a4ef1 worktree: accept multiple paths\n\n-- \ngitgitgadget\n"},{"id":"452510","messageId":"1df005a4ef1e387c7f7f5486a7a8800b9cd204a8.1648500426.git.gitgitgadget@gmail.com","threadId":"57618","inReplyTo":"pull.1188.v2.git.1648500426.gitgitgadget@gmail.com","subject":"[PATCH v2 2/2] worktree: accept multiple paths","fromName":"Des Preston via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-03-28T20:47:06Z","receivedAt":"2022-03-28T20:48:22Z","isPatch":true,"sender":{"key":"name:Des Preston","avatar":null},"body":"From: Des Preston \n\nUpdate the worktree usage to show that the repair command can take\nmultiple paths.\n\nSigned-off-by: Des Preston \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 8682ff4c417..498975c1fd9 100644\n--- a/builtin/worktree.c\n+++ b/builtin/worktree.c\n@@ -22,7 +22,7 @@ static const char * const worktree_usage[] = {\n \tN_(\"git worktree move \"),\n \tN_(\"git worktree prune []\"),\n \tN_(\"git worktree remove [] \"),\n-\tN_(\"git worktree repair []\"),\n+\tN_(\"git worktree repair [...]\"),\n \tN_(\"git worktree unlock \"),\n \tNULL\n };\n-- \ngitgitgadget\n"},{"id":"452511","messageId":"e0bfbfd5320edad29d20bef5e4eab2750bc3016c.1648500426.git.gitgitgadget@gmail.com","threadId":"57618","inReplyTo":"pull.1188.v2.git.1648500426.gitgitgadget@gmail.com","subject":"[PATCH v2 1/2] worktree: include repair cmd in usage","fromName":"Des Preston via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-03-28T20:47:05Z","receivedAt":"2022-03-28T20:48:26Z","isPatch":true,"sender":{"key":"name:Des Preston","avatar":null},"body":"From: Des Preston \n\nThe worktree repair command was not added to the usage menu for the\nworktree command. This commit adds the usage of 'worktree repair'\naccording to the existing docs.\n\nSigned-off-by: Des Preston \n---\n builtin/worktree.c | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/builtin/worktree.c b/builtin/worktree.c\nindex 2838254f7f2..8682ff4c417 100644\n--- a/builtin/worktree.c\n+++ b/builtin/worktree.c\n@@ -22,6 +22,7 @@ static const char * const worktree_usage[] = {\n \tN_(\"git worktree move \"),\n \tN_(\"git worktree prune []\"),\n \tN_(\"git worktree remove [] \"),\n+\tN_(\"git worktree repair []\"),\n \tN_(\"git worktree unlock \"),\n \tNULL\n };\n-- \ngitgitgadget\n\n"},{"id":"452538","messageId":"xmqq35j1zi7j.fsf@gitster.g","threadId":"57618","inReplyTo":"1df005a4ef1e387c7f7f5486a7a8800b9cd204a8.1648500426.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v2 2/2] worktree: accept multiple paths","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-03-29T01:00:00Z","receivedAt":"2022-03-29T01:00:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Des Preston via GitGitGadget\" writes:\n\n> From: Des Preston \n>\n> Update the worktree usage to show that the repair command can take\n> multiple paths.\n>\n> Signed-off-by: Des Preston \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 8682ff4c417..498975c1fd9 100644\n> --- a/builtin/worktree.c\n> +++ b/builtin/worktree.c\n> @@ -22,7 +22,7 @@ static const char * const worktree_usage[] = {\n> \tN_(\"git worktree move \"),\n> \tN_(\"git worktree prune []\"),\n> \tN_(\"git worktree remove [] \"),\n> -\tN_(\"git worktree repair []\"),\n> +\tN_(\"git worktree repair [...]\"),\n\nThe fact that this line was introduced in [PATCH 1/2] and then\nneeded to immediately be corrected with this patch means the\nprevious patch was suboptimal and this patch is \"oops, the last one\nwas bad and here is a band-aid fix-up\".\n\nLet's not do so. Instead, you are encouraged to pretend to be a\nmore perfect developer who does not make unnecessary mistake ;-)\n\n"},{"id":"452545","messageId":"48242777-6442-4A4D-BE76-1B9EF2F7175B@gmail.com","threadId":"57618","inReplyTo":"xmqq35j1zi7j.fsf@gitster.g","subject":"Re: [PATCH v2 2/2] worktree: accept multiple paths","fromName":"Desmond Preston","fromEmail":"despreston@gmail.com","sentAt":"2022-03-29T03:00:54Z","receivedAt":"2022-03-29T03:01:01Z","isPatch":true,"sender":{"key":"despreston@gmail.com","avatar":null},"body":"k. \n\n> On Mar 28, 2022, at 9:00 PM, Junio C Hamano wrote:\n> \n> \"Des Preston via GitGitGadget\" writes:\n> \n>> From: Des Preston \n>> \n>> Update the worktree usage to show that the repair command can take\n>> multiple paths.\n>> \n>> Signed-off-by: Des Preston \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 8682ff4c417..498975c1fd9 100644\n>> --- a/builtin/worktree.c\n>> +++ b/builtin/worktree.c\n>> @@ -22,7 +22,7 @@ static const char * const worktree_usage[] = {\n>> N_(\"git worktree move \"),\n>> N_(\"git worktree prune []\"),\n>> N_(\"git worktree remove [] \"),\n>> - N_(\"git worktree repair []\"),\n>> + N_(\"git worktree repair [...]\"),\n> \n> The fact that this line was introduced in [PATCH 1/2] and then\n> needed to immediately be corrected with this patch means the\n> previous patch was suboptimal and this patch is \"oops, the last one\n> was bad and here is a band-aid fix-up\".\n> \n> Let's not do so. Instead, you are encouraged to pretend to be a\n> more perfect developer who does not make unnecessary mistake ;-)\n> \n"},{"id":"452578","messageId":"xmqq1qykycgc.fsf@gitster.g","threadId":"57618","inReplyTo":"48242777-6442-4A4D-BE76-1B9EF2F7175B@gmail.com","subject":"Re: [PATCH v2 2/2] worktree: accept multiple paths","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-03-29T16:01:55Z","receivedAt":"2022-03-29T16:02:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Desmond Preston writes:\n\n>> On Mar 28, 2022, at 9:00 PM, Junio C Hamano wrote:\n>> \n>> \"Des Preston via GitGitGadget\" writes:\n>> \n>>> From: Des Preston \n>>> \n>>> Update the worktree usage to show that the repair command can take\n>>> multiple paths.\n>>> \n>>> Signed-off-by: Des Preston \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 8682ff4c417..498975c1fd9 100644\n>>> --- a/builtin/worktree.c\n>>> +++ b/builtin/worktree.c\n>>> @@ -22,7 +22,7 @@ static const char * const worktree_usage[] = {\n>>> N_(\"git worktree move \"),\n>>> N_(\"git worktree prune []\"),\n>>> N_(\"git worktree remove [] \"),\n>>> - N_(\"git worktree repair []\"),\n>>> + N_(\"git worktree repair [...]\"),\n>> \n>> The fact that this line was introduced in [PATCH 1/2] and then\n>> needed to immediately be corrected with this patch means the\n>> previous patch was suboptimal and this patch is \"oops, the last one\n>> was bad and here is a band-aid fix-up\".\n>> \n>> Let's not do so. Instead, you are encouraged to pretend to be a\n>> more perfect developer who does not make unnecessary mistake ;-)\n>> \n> k. \n\nFYI, I've queued [1/2] with the fix-up in [2/2] squashed in.\n\nThanks.\n\n----- >8 --------- >8 --------- >8 --------- >8 --------- >8 -----\nFrom: Des Preston \nDate: Mon, 28 Mar 2022 20:47:05 +0000\nSubject: [PATCH] worktree: include repair cmd in usage\n\nThe worktree repair command was not added to the usage menu for the\nworktree command. This commit adds the usage of 'worktree repair'\naccording to the existing docs.\n\nSigned-off-by: Des Preston \nSigned-off-by: Junio C Hamano \n---\n builtin/worktree.c | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/builtin/worktree.c b/builtin/worktree.c\nindex 2838254f7f..498975c1fd 100644\n--- a/builtin/worktree.c\n+++ b/builtin/worktree.c\n@@ -22,6 +22,7 @@ static const char * const worktree_usage[] = {\n \tN_(\"git worktree move \"),\n \tN_(\"git worktree prune []\"),\n \tN_(\"git worktree remove [] \"),\n+\tN_(\"git worktree repair [...]\"),\n \tN_(\"git worktree unlock \"),\n \tNULL\n };\n-- \n2.35.1-850-g6c97ec7725\n\n\n"},{"id":"452595","messageId":"CAPig+cSJPoj8jk_JHmpc4=3bupZ98dKmDi+POZQXZxJR+CjhKA@mail.gmail.com","threadId":"57618","inReplyTo":"xmqq1qykycgc.fsf@gitster.g","subject":"Re: [PATCH v2 2/2] worktree: accept multiple paths","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2022-03-29T18:36:52Z","receivedAt":"2022-03-29T18:37:06Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Tue, Mar 29, 2022 at 12:02 PM Junio C Hamano wrote:\n> Desmond Preston writes:\n> >> The fact that this line was introduced in [PATCH 1/2] and then\n> >> needed to immediately be corrected with this patch means the\n> >> previous patch was suboptimal and this patch is \"oops, the last one\n> >> was bad and here is a band-aid fix-up\".\n> >>\n> >> Let's not do so. Instead, you are encouraged to pretend to be a\n> >> more perfect developer who does not make unnecessary mistake ;-)\n>\n> FYI, I've queued [1/2] with the fix-up in [2/2] squashed in.\n>\n> N_(\"git worktree remove [] \"),\n> + N_(\"git worktree repair [...]\"),\n> N_(\"git worktree unlock \"),\n\nThis version looks good to me and addresses my review comments[*], and\nstill has my Acked-by: for what it's worth.\n\nThanks for putting the finishing touches on this.\n\n[*]: https://lore.kernel.org/git/3f823608-adf4-f717-13d8-8da6f89a9506@sunshineco.com/\n"}]}