Merge branch 'si/zsh-complete-comment-fix'

gitster · gitster · commit 70a890d42f6c · 2021-05-07T12:47:42.000+09:00
Portability fix for command line completion script (in contrib/).

* si/zsh-complete-comment-fix:
  work around zsh comment in __git_complete_worktree_paths
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -3250,9 +3250,10 @@ _git_whatchanged ()
 __git_complete_worktree_paths ()
 {
 	local IFS=$'\n'
+	# Generate completion reply from worktree list skipping 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')"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3250,9 +3250,10 @@ _git_whatchanged ()`
`3250`	`3250`	`__git_complete_worktree_paths ()`
`3251`	`3251`	`{`
`3252`	`3252`	`local IFS=$'\n'`
	`3253`	`+ # Generate completion reply from worktree list skipping the first`
	`3254`	`+ # entry: it's the path of the main worktree, which can't be moved,`
	`3255`	`+ # removed, locked, etc.`
`3253`	`3256`	`__gitcomp_nl "$(git worktree list --porcelain \|`
`3254`		`- # Skip the first entry: it's the path of the main worktree,`
`3255`		`- # which can't be moved, removed, locked, etc.`
`3256`	`3257`	`sed -n -e '2,$ s/^worktree //p')"`
`3257`	`3258`	`}`
`3258`	`3259`