git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RFC PATCH 0/2] teach `worktree list` to mark locked worktrees
@ 2020-09-28 15:49 Rafael Silva
  2020-09-28 15:49 ` [RFC PATCH 1/2] worktree: teach `list` to mark locked worktree Rafael Silva
                   ` (4 more replies)
  0 siblings, 5 replies; 23+ messages in thread
From: Rafael Silva @ 2020-09-28 15:49 UTC (permalink / raw)
  To: git; +Cc: Rafael Silva

This patch series introduces a new information on the git `worktree list`
command output, to mark when a worktree is locked with a (locked) text mark.

The intent is to improve the user experience to earlier sinalize that a linked
worktree is locked, instead of realising later when attempting to remove it
with `remove` command as it happened to me twice :)

The patches are divided into two parts. First part introduces
the new marker to the worktree list command and small documentation
change. And the second adds one test case into t2402 to test
if the (locked) text will be properly set for a locked worktree, and
not mistankely set to a unlocked or master worktree.

This is the output of the worktree list with locked marker:

  $ git worktree list
  /repo/to/main                abc123 [master]
  /path/to/unlocked-worktree1  456def [brancha]
  /path/to/locked-worktree     123abc (detached HEAD) (locked)

This patches are marked with RFC mainly due to:

  - This will change the default behaviour of the worktree list, I am
    not sure whether will be better to make this tuned via a config
    and/or a git parameter. (assuming this change is a good idea ;) )

  - Perhaps the `(locked)` marker is not the best suitable way to output
    this information and we might need to come with a better way.

  - I am a new contributor to the code base, still learning a lot of git
    internals data structure and commands. Likely this patch will require
    updates.

Rafael Silva (2):
  teach `list` to mark locked worktree
  t2402: add test to locked linked worktree marker

 Documentation/git-worktree.txt |  5 +++--
 builtin/worktree.c             |  6 +++++-
 t/t2402-worktree-list.sh       | 13 +++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

-- 
2.28.0.763.ge7086f1eef


^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2020-10-12  2:24 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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 NNTP newsgroup(s).