work around zsh comment in __git_complete_worktree_paths

[PATCH]: contrib/completion/git-completion.bash, there is a construct where comment lines are placed between the command that is on the upstream of a pipe and the command that is on the downstream of a pipe in __git_complete_worktree_paths function. Unfortunately, this script is also used by Zsh completion, but Zsh mishandles this construct when "interactive_comments" option is not set (by default it is off on macOS), resulting in a breakage: $ git worktree remove [TAB] $ git worktree remove __git_complete_worktree_paths:7: command not found: # Move the comment, even though it explains what happens on the downstream of the pipe and logically belongs where it is right now, before the entire pipeline, to work around this problem. Signed-off-by: Sardorbek Imomaliev <sardorbek.imomaliev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sardorbek Imomaliev committed May 3, 2021 at 16:29 UTC f2acf763e29a3696fef268a9e8dc421e807df7f2
1 file changed +3 -2
contrib/completion/git-completion.bash
+3 -2
@@ -3268,9 +3268,10 @@ _git_whatchanged ()
3268 __git_complete_worktree_paths ()
3269 {
3270 local IFS=$'\n'
3271 + # Generate completion reply from worktree list skipping the first
3272 + # entry: it's the path of the main worktree, which can't be moved,
3273 + # removed, locked, etc.
3274 __gitcomp_nl "$(git worktree list --porcelain |
3272 - # Skip the first entry: it's the path of the main worktree,
3273 - # which can't be moved, removed, locked, etc.
3275 sed -n -e '2,$ s/^worktree //p')"
3276 }
3277