From: Rafael Silva <rafaeloliveira.cs@gmail.com>
To: git@vger.kernel.org
Cc: sunshine@sunshineco.com, gitster@pobox.com,
Rafael Silva <rafaeloliveira.cs@gmail.com>
Subject: [PATCH v3 0/1] Teach "worktree list" to annotate locked worktrees
Date: Sun, 11 Oct 2020 10:11:51 +0000 [thread overview]
Message-ID: <20201011101152.5291-1-rafaeloliveira.cs@gmail.com> (raw)
In-Reply-To: <20201010185521.23032-1-rafaeloliveira.cs@gmail.com>
This patch introduces a new information on the "git worktree list"
command output to annotate when a worktree is locked with a "locked" text.
The intent is to improve the user experience as the "git worktree remove"
refuses to remove a locked worktree. By adding the "locked" annotation
to the "git worktree list" command, the user would not attempt to remove
a worktree or would know to use "git worktree remove -f -f <path>"
to force a worktree removal.
The output of the "worktree list" command becomes:
$ git worktree list
/path/to/main abc123 [master]
/path/to/worktree 456def [brancha]
/path/to/locked-worktree 123abc (detached HEAD) locked
Changes since v2:
* Regexes used to test the "locked" anotation are anchored and space is added
between the worktree path and OID hex string to avoid false-positives and
to ensure there is space between the worktree path and the OID.
Changes since v1:
* Drooped the parenthesis in "(locked)" to reduce the noise and allow
easier extensions of more annotations design proposed in [2].
* Rewrite of the commit message with a much better one.
* Simplification of the test added to `t2402` with only caring about
the "locked" annotation at the end of the "worktree list" output.
[2]: https://lore.kernel.org/git/CAPig+cQF6V8HNdMX5AZbmz3_w2WhSfA4SFfNhQqxXBqPXTZL+w@mail.gmail.com/
Thank you Junio C Hamano and Eric Sunshine for the detailed review
and helping with this patch.
Rafael Silva (1):
worktree: teach `list` to annotate locked worktree
Documentation/git-worktree.txt | 3 ++-
builtin/worktree.c | 5 ++++-
t/t2402-worktree-list.sh | 10 ++++++++++
3 files changed, 16 insertions(+), 2 deletions(-)
--
2.29.0.rc0.253.gc238dab514
next prev parent reply other threads:[~2020-10-11 10:13 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 ` Rafael Silva [this message]
2020-10-11 10:11 ` [PATCH v3] " Rafael Silva
2020-10-12 2:24 ` 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=20201011101152.5291-1-rafaeloliveira.cs@gmail.com \
--to=rafaeloliveira.cs@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.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).