From: Sardorbek Imomaliev <sardorbek.imomaliev@xxxxxxxxx>
Completion helper function fails for zsh because of wrongly put comment
Signed-off-by: Sardorbek Imomaliev <sardorbek.imomaliev@xxxxxxxxx>
---
Fix: wrongly put comment for __git_complete_worktree_paths completion
helper function
git completion script fails for zsh
$ git worktree remove [TAB]
$ git worktree remove __git_complete_worktree_paths:7: command not found: #
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-943%2Fimomaliev%2Ffix%2Fgit-completion-worktree-subcommands-comment-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-943/imomaliev/fix/git-completion-worktree-subcommands-comment-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/943
contrib/completion/git-completion.bash | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index dfa735ea6299..b2e158edaf6b 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -3268,9 +3268,9 @@ _git_whatchanged ()
__git_complete_worktree_paths ()
{
local IFS=$'\n'
+ # Skip the first entry: it's the path of the main worktree,
+ # which can't be moved, removed, locked, etc.
__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')"
}
base-commit: 311531c9de557d25ac087c1637818bd2aad6eb3a
--
gitgitgadget
