From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Maxim Belsky via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Max Belsky <public.belsky@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 1/1] doc: Change zsh git completion file name
Date: Tue, 15 Oct 2019 01:44:39 +0200 [thread overview]
Message-ID: <20191014234439.GT29845@szeder.dev> (raw)
In-Reply-To: <3f994f3b9a49c42bb8b605459817e54479327dc7.1570816467.git.gitgitgadget@gmail.com>
On Fri, Oct 11, 2019 at 10:54:28AM -0700, Maxim Belsky via GitGitGadget wrote:
> From: Maxim Belsky <public.belsky@gmail.com>
>
> The original comment does not describe type of ~/.zsh/_git explicitly
> and zsh does not warn or fail if a user create it as a dictionary.
> So unexperienced users could be misled by the original comment.
>
> There is a small update to clarify it.
>
> Signed-off-by: Maxim Belsky <public.belsky@gmail.com>
> Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> Helped-by: Junio C Hamano <gitster@pobox.com>
> ---
> contrib/completion/git-completion.zsh | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
> index 886bf95d1f..eef4eff53d 100644
> --- a/contrib/completion/git-completion.zsh
> +++ b/contrib/completion/git-completion.zsh
> @@ -11,8 +11,9 @@
> #
> # zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh
> #
> -# The recommended way to install this script is to copy to '~/.zsh/_git', and
> -# then add the following to your ~/.zshrc file:
> +# The recommended way to install this script is to make a copy of it in
> +# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following
These updated instructions don't work for me, following them gives me
zsh's git completion instead of ours:
$ ls -l /etc/bash_completion.d/git
-rwxr-xr-x 1 root root 72165 Oct 15 01:27 /etc/bash_completion.d/git
$ ls -l ~/.zsh/
total 8
-rw-r--r-- 1 szeder szeder 6013 Oct 15 01:27 git-completion.zsh
$ cat ~/.zshrc
# Use modern completion system
autoload -Uz compinit
compinit
fpath=(~/.zsh $fpath)
$ zsh
% git init --<TAB>
--bare -- create a bare repository
--quiet -- do not print any results to stdout
--separate-git-dir -- create git dir elsewhere and link it using the gitdir
--shared -- share repository amongst several users
--template -- directory to use as a template for the object databas
That's clearly zsh's fancy completion.
As a non-zsh user I had the impression that it's a well-established
convention that the completion script of a command for zsh is called
'_command', see e.g. all the scripts in:
https://github.com/zsh-users/zsh-completions/tree/master/src
Instructing users to copy our completion script to
'~/.zsh/git-completion.zsh' goes against this convention.
More importantly, it appears that this is more than a mere convention,
maybe a requirement even; at least renaming our zsh completion script
to follow the convention (IOW following the current install
instructions) makes it work all of a sudden:
$ mv .zsh/git-completion.zsh .zsh/_git
$ zsh
% git init --
-- --no-separate-git-dir --shared
--bare --no-template --template=
--no-bare --quiet
--no-quiet --separate-git-dir=
Now that's our Bash completion script used by zsh.
next prev parent reply other threads:[~2019-10-14 23:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-10 16:56 [PATCH 0/1] doc: Add a note about ~/.zsh/_git file Max Belsky via GitGitGadget
2019-10-10 16:56 ` [PATCH 1/1] doc: Change zsh git completion file name Maxim Belsky via GitGitGadget
2019-10-10 21:12 ` Johannes Schindelin
2019-10-11 5:57 ` Junio C Hamano
2019-10-11 17:54 ` [PATCH v2 0/1] doc: Add a note about ~/.zsh/_git file Max Belsky via GitGitGadget
2019-10-11 17:54 ` [PATCH v2 1/1] doc: Change zsh git completion file name Maxim Belsky via GitGitGadget
2019-10-12 1:35 ` Junio C Hamano
2019-10-14 23:44 ` SZEDER Gábor [this message]
2019-10-15 2:07 ` Junio C Hamano
2020-10-25 3:40 ` Felipe Contreras
2019-10-15 18:48 ` [PATCH v3 0/1] doc: Add a note about ~/.zsh/_git file Max Belsky via GitGitGadget
2019-10-15 18:48 ` [PATCH v3 1/1] doc: Change zsh git completion file name Maxim Belsky via GitGitGadget
2019-10-16 2:06 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191014234439.GT29845@szeder.dev \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=public.belsky@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).