From: Eric Sunshine <sunshine@sunshineco.com>
To: Des Preston via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Des Preston <despreston@gmail.com>
Subject: Re: [PATCH] worktree: include repair cmd in usage
Date: Fri, 25 Mar 2022 15:55:19 -0400 [thread overview]
Message-ID: <3f823608-adf4-f717-13d8-8da6f89a9506@sunshineco.com> (raw)
In-Reply-To: <pull.1188.git.1648231504463.gitgitgadget@gmail.com>
On 3/25/22 2:05 PM, Des Preston via GitGitGadget wrote:
> 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 <despreston@gmail.com>
Thanks for fixing my oversight. This certainly should have been done by
e8e1ff24c5 (worktree: add skeleton "repair" command, 2020-08-27).
One minor comment below...
> diff --git 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>"),
The usage message should reflect the fact that `git worktree repair` can
accept multiple paths, thus:
N_("git worktree repair [<path>...]"),
which would also make it consistent with the synopsis in
Documentation/worktree.txt.
With that change applied, consider this:
Acked-by: Eric Sunshine <sunshine@sunshineco.com>
next prev parent reply other threads:[~2022-03-25 20:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-25 18:05 [PATCH] worktree: include repair cmd in usage Des Preston via GitGitGadget
2022-03-25 19:55 ` Eric Sunshine [this message]
2022-03-28 20:47 ` [PATCH v2 0/2] " Des Preston via GitGitGadget
2022-03-28 20:47 ` [PATCH v2 1/2] " Des Preston via GitGitGadget
2022-03-28 20:47 ` [PATCH v2 2/2] worktree: accept multiple paths Des Preston via GitGitGadget
2022-03-29 1:00 ` Junio C Hamano
2022-03-29 3:00 ` Desmond Preston
2022-03-29 16:01 ` Junio C Hamano
2022-03-29 18:36 ` Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3f823608-adf4-f717-13d8-8da6f89a9506@sunshineco.com \
--to=sunshine@sunshineco.com \
--cc=despreston@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).