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

Re: [PATCH] Fix: fix comment for __git_complete_worktree_paths

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 30, 2021, 00:42 UTC
Message-ID
<xmqq1rasfvqn.fsf@gitster.g>
In-Reply-To
<pull.943.git.1619685833872.gitgitgadget@gmail.com>

"Sardorbek Imomaliev via GitGitGadget" <gitgitgadget@gmail.com> writes:

> Subject: Re: [PATCH] Fix: fix comment for __git_complete_worktree_paths

In this project, we write what area of the codebase the change affects before the colon (I'll give you an example later).

> From: Sardorbek Imomaliev <sardorbek.imomaliev@gmail.com>
>
> Completion helper function fails for zsh because of wrongly put comment

Isn't it a bug in zsh that it does not understand that the comment is about the command placed on the downstream of the pipe, like this example?

	echo a b c |
	# upcase the input (a comment about the next line)
	tr a-z A-Z

Apparently bash is happy with the existing code, and dash and ksh seems to be OK with the above construct, too.

Perhaps rephrase the log message like this instead?
    [PATCH] completion: work around zsh comment but in __git_complete_worktree_paths
    In 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, 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.

It might also be necessary to consider rephrasing the comment itself, not just "Move the comment", to make sure that it is still appropriate when used as a comment to cover the whole pipeline---the original was meant to explain what happens in the downstream only.

Thanks.
Show 18 quoted lines
> 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
Previous: Sardorbek Imomaliev via GitGitGadgetNext: Sardorbek Imomaliev via GitGitGadget
Message 2 of 4 in “Fix: fix comment for __git_complete_worktree_paths”
  1. Fix: fix comment for __git_complete_worktree_pathsSardorbek Imomaliev via GitGitGadget, Apr 29, 2021
  2. Junio C HamanoApr 30, 2021
  3. work around zsh comment in __git_complete_worktree_pathsSardorbek Imomaliev via GitGitGadget, May 3, 2021
  4. Junio C HamanoMay 4, 2021

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.