git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[RFC PATCH 0/2] teach `worktree list` to mark locked worktrees

From
Rafael Silva <rafaeloliveira.cs@gmail.com>
Date
Sep 28, 2020, 15:49 UTC
Message-ID
<20200928154953.30396-1-rafaeloliveira.cs@gmail.com>

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
Next: Rafael Silva
Message 1 of 23 in “teach `worktree list` to mark locked worktrees”
  1. 0/2 teach `worktree list` to mark locked worktreesRafael Silva, Sep 28, 2020
  2. 1/2 worktree: teach `list` to mark locked worktreeRafael Silva, Sep 28, 2020
  3. Junio C HamanoSep 28, 2020
  4. Rafael SilvaSep 29, 2020
  5. Eric SunshineSep 30, 2020
  6. 2/2 t2402: add test to locked linked worktree markerRafael Silva, Sep 28, 2020
  7. Junio C HamanoSep 28, 2020
  8. Rafael SilvaSep 29, 2020
  9. Eric SunshineSep 30, 2020
  10. Junio C HamanoSep 28, 2020
  11. Rafael SilvaSep 29, 2020
  12. Eric SunshineSep 30, 2020
  13. Rafael SilvaOct 2, 2020
  14. Eric SunshineOct 9, 2020
  15. Rafael SilvaOct 10, 2020
  16. 0/1 Teach "worktree list" to annotate locked worktreesRafael Silva, Oct 10, 2020
  17. 1/1 worktree: teach `list` to annotate locked worktreeRafael Silva, Oct 10, 2020
  18. Eric SunshineOct 11, 2020
  19. Eric SunshineOct 11, 2020
  20. Rafael SilvaOct 11, 2020
  21. 0/1 Teach "worktree list" to annotate locked worktreesRafael Silva, Oct 11, 2020
  22. worktree: teach `list` to annotate locked worktreeRafael Silva, Oct 11, 2020
  23. Eric SunshineOct 12, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.