From: Eric Sunshine <sunshine@sunshineco.com>
To: Rafael Silva <rafaeloliveira.cs@gmail.com>
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v3] worktree: teach `list` to annotate locked worktree
Date: Sun, 11 Oct 2020 22:24:19 -0400 [thread overview]
Message-ID: <CAPig+cS8hvX4GCsnfLBnQ4Q_AkUad=bw7rjVcaOqSEqcLZvx8w@mail.gmail.com> (raw)
In-Reply-To: <20201011101152.5291-2-rafaeloliveira.cs@gmail.com>
On Sun, Oct 11, 2020 at 6:12 AM Rafael Silva
<rafaeloliveira.cs@gmail.com> wrote:
> Teach "git worktree list" to append "locked" to its output.
>
> Signed-off-by: Rafael Silva <rafaeloliveira.cs@gmail.com>
> ---
> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
> @@ -97,7 +97,8 @@ list::
> followed by each of the linked working trees. The output details include
> whether the working tree is bare, the revision currently checked out, and the
Nit: I'd probably drop the "and" just before the end of this line...
> -branch currently checked out (or "detached HEAD" if none).
> +branch currently checked out (or "detached HEAD" if none), and "locked" if
> +the worktree is locked.
... which would leave just the one "and" here. However, this is minor
and almost certainly not worth a re-roll.
> +test_expect_success '"list" all worktress with locked annotation' '
> + test_when_finished "rm -rf locked unlocked out && git worktree prune" &&
> + git worktree add --detach locked master &&
> + git worktree add --detach unlocked master &&
> + git worktree lock locked &&
> + git worktree list >out &&
> + grep "/locked *[0-9a-f].* locked$" out &&
> + ! grep "/unlocked *[0-9a-f].* locked$" out
> +'
Looks good. With or without the minor suggested documentation tweak,
consider this patch:
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
prev parent reply other threads:[~2020-10-12 2:24 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 15:49 [RFC PATCH 0/2] teach `worktree list` to mark locked worktrees Rafael Silva
2020-09-28 15:49 ` [RFC PATCH 1/2] worktree: teach `list` to mark locked worktree Rafael Silva
2020-09-28 21:37 ` Junio C Hamano
2020-09-29 21:36 ` Rafael Silva
2020-09-30 7:35 ` Eric Sunshine
2020-09-28 15:49 ` [RFC PATCH 2/2] t2402: add test to locked linked worktree marker Rafael Silva
2020-09-28 21:54 ` Junio C Hamano
2020-09-29 21:37 ` Rafael Silva
2020-09-30 8:06 ` Eric Sunshine
2020-09-28 21:19 ` [RFC PATCH 0/2] teach `worktree list` to mark locked worktrees Junio C Hamano
2020-09-29 21:35 ` Rafael Silva
2020-09-30 7:19 ` Eric Sunshine
2020-10-02 16:28 ` Rafael Silva
2020-10-09 22:50 ` Eric Sunshine
2020-10-10 19:06 ` Rafael Silva
2020-10-10 18:55 ` [PATCH v2 0/1] Teach "worktree list" to annotate " Rafael Silva
2020-10-10 18:55 ` [PATCH v2 1/1] worktree: teach `list` to annotate locked worktree Rafael Silva
2020-10-11 6:26 ` Eric Sunshine
2020-10-11 6:34 ` Eric Sunshine
2020-10-11 10:04 ` Rafael Silva
2020-10-11 10:11 ` [PATCH v3 0/1] Teach "worktree list" to annotate locked worktrees Rafael Silva
2020-10-11 10:11 ` [PATCH v3] worktree: teach `list` to annotate locked worktree Rafael Silva
2020-10-12 2:24 ` Eric Sunshine [this message]
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='CAPig+cS8hvX4GCsnfLBnQ4Q_AkUad=bw7rjVcaOqSEqcLZvx8w@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rafaeloliveira.cs@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).