Subject: Re: [PATCH v2 2/2] worktree: accept multiple paths

From: Junio C Hamano <[email-masked]>
Date: Tue, 29 Mar 2022 09:01:55 -0700

Desmond Preston <[email-masked]> writes:

>> On Mar 28, 2022, at 9:00 PM, Junio C Hamano <[email-masked]> wrote:
>> 
>> "Des Preston via GitGitGadget" <[email-masked]> writes:
>> 
>>> From: Des Preston <[email-masked]>
>>> 
>>> Update the worktree usage to show that the repair command can take
>>> multiple paths.
>>> 
>>> Signed-off-by: Des Preston <[email-masked]>
>>> ---
>>> builtin/worktree.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>> 
>>> diff --git a/builtin/worktree.c b/builtin/worktree.c
>>> index 8682ff4c417..498975c1fd9 100644
>>> --- a/builtin/worktree.c
>>> +++ b/builtin/worktree.c
>>> @@ -22,7 +22,7 @@ static const char * const worktree_usage[] = {
>>>    N_("git worktree move <worktree> <new-path>"),
>>>    N_("git worktree prune [<options>]"),
>>>    N_("git worktree remove [<options>] <worktree>"),
>>> -    N_("git worktree repair [<path>]"),
>>> +    N_("git worktree repair [<path>...]"),
>> 
>> The fact that this line was introduced in [PATCH 1/2] and then
>> needed to immediately be corrected with this patch means the
>> previous patch was suboptimal and this patch is "oops, the last one
>> was bad and here is a band-aid fix-up".
>> 
>> Let's not do so.  Instead, you are encouraged to pretend to be a
>> more perfect developer who does not make unnecessary mistake ;-)
>> 
> k. 

FYI, I've queued [1/2] with the fix-up in [2/2] squashed in.

Thanks.

----- >8 --------- >8 --------- >8 --------- >8 --------- >8 -----
From: Des Preston <[email-masked]>
Date: Mon, 28 Mar 2022 20:47:05 +0000
Subject: [PATCH] worktree: include repair cmd in usage

The worktree repair command was not added to the usage menu for the
worktree command. This commit adds the usage of 'worktree repair'
according to the existing docs.

Signed-off-by: Des Preston <[email-masked]>
Signed-off-by: Junio C Hamano <[email-masked]>
---
 builtin/worktree.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 2838254f7f..498975c1fd 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -22,6 +22,7 @@ static const char * const worktree_usage[] = {
 	N_("git worktree move <worktree> <new-path>"),
 	N_("git worktree prune [<options>]"),
 	N_("git worktree remove [<options>] <worktree>"),
+	N_("git worktree repair [<path>...]"),
 	N_("git worktree unlock <path>"),
 	NULL
 };
-- 
2.35.1-850-g6c97ec7725