Skip to content

completion: improve completion for 'git worktree'

SZEDER Gábor git 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest6 patches 0 repliesNew
  2. v16 patches 8 repliesSuperseded

Changes in v2 from the cover letter

- Added an in-code comment and clarified the commit message of patch

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6t9902-completion: add tests for the __git_find_on_cmdline() helpert/t9902-completion.sh+28 -00 replies
2/6completion: clean up the __git_find_on_cmdline() helper functioncontrib/completion/git-completion.bash+8 -50 replies
3/6completion: return the index of found word from __git_find_on_cmdline()contrib/completion/git-completion.bash t/t9902-completion.sh+46 -30 replies
4/6completion: simplify completing 'git worktree' subcommands and optionscontrib/completion/git-completion.bash+8 -220 replies
5/6completion: list existing working trees for 'git worktree' subcommandscontrib/completion/git-completion.bash+29 -10 replies
6/6completion: list paths and refs for 'git worktree add'contrib/completion/git-completion.bash+36 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/6] completion: improve completion for 'git worktree'

Complete paths of working trees and refs for 'git worktree's various subcommands.

The last two patches do the actual improvements, the first four are preparatory steps.

Changes since v1:

- Added an in-code comment and clarified the commit message of patch

    5/6.

v1: https://public-inbox.org/git/[email protected]/T/#u

SZEDER Gábor (6):
t9902-completion: add tests for the __git_find_on_cmdline() helper
completion: clean up the __git_find_on_cmdline() helper function
completion: return the index of found word from

    __git_find_on_cmdline()

completion: simplify completing 'git worktree' subcommands and options
completion: list existing working trees for 'git worktree' subcommands
completion: list paths and refs for 'git worktree add'

 contrib/completion/git-completion.bash | 119 +++++++++++++++++++------
 t/t9902-completion.sh                  |  57 ++++++++++++
 2 files changed, 150 insertions(+), 26 deletions(-)

Range-diff against v1:

1:  bd68b0b64b = 1:  b370a97edc t9902-completion: add tests for the __git_find_on_cmdline() helper
2:  b5c0312db6 = 2:  fb8f1e4840 completion: clean up the __git_find_on_cmdline() helper function
3:  6999b0b8e2 = 3:  47aecb9ac0 completion: return the index of found word from __git_find_on_cmdline()
4:  dd38374f2f = 4:  00c5a0f7df completion: simplify completing 'git worktree' subcommands and options
5:  619ff7021c ! 5:  2e4b1b3931 completion: list existing working trees for 'git worktree' subcommands

@@ Commit message
Never list the path of the main working tree, as it cannot be moved, removed, locked, or unlocked.

- Arguably 'git worktree unlock <TAB>' should only complete locked
- working trees, but 'git worktree list --porcelain' doesn't indicate
- which working trees are locked. So for now it will complete the paths
- of all existing working trees, including non-locked ones as well.
+ Ideally we would only list unlocked working trees for the 'move',
+ 'remove', and 'lock' subcommands, and only locked ones for 'unlock'.
+ Alas, 'git worktree list --porcelain' doesn't indicate which working
+ trees are locked, so for now we'll complete the paths of all existing
+ working trees.

@@ contrib/completion/git-completion.bash: _git_whatchanged ()
+{
+ local IFS=$'\n'
+ __gitcomp_nl "$(git worktree list --porcelain |
++ # Skip the first entry: it's the path of the main worktree,
++ # which can't be moved, removed, locked, etc.
+ sed -n -e '2,$ s/^worktree //p')"
+}
+
6: 29a32e5d36 = 6: 16a9b5f4b2 completion: list paths and refs for 'git worktree add'

Signature · 1 line
2.24.1.982.ga4d4aba446