Re: [PATCH] Fix zsh installation instructions
- From
- Stefan Haller <lists@haller-berlin.de>
- Date
- Oct 14, 2020, 15:10 UTC
- Message-ID
- <abc4ab95-ed65-1d6b-e964-73734c08cda9@haller-berlin.de>
- In-Reply-To
- <xmqqr1to8dv9.fsf@gitster.c.googlers.com>
On 07.07.20 0:42, Junio C Hamano wrote:
Show 5 quoted lines
>> From: Alexey <lesha.ogonkov@gmail.com> > > Thanks. > > Any zsh users raise their hands? Does this change look sane?
Sorry for the late reply, I only saw this now.
Yes, the change is sane. The wrong file extension (.zsh vs. .bash) was a documentation bug that I had noticed myself, but forgot to submit a patch for.
The other hunk (adding compinit) is not so important to me; I suppose it was not in the original version because most zsh users already have this in their .zshrc anyway. But it's not wrong, and doesn't hurt to have here, I guess.
Best, Stefan
Show 44 quoted lines
>> - Fix wrong script in completion configuration. zsh wants bash completion
>> path here, not path to itself.
>> - Add `compinit` autoload command, since whole thing didn't work
>> if it is not loaded.
>>
>> Signed-off-by: Alexey <lesha.ogonkov@gmail.com>
>> ---
>> Fix zsh installation instructions
>>
>> * Fix wrong script in completion configuration. zsh wants bash
>> completion path here, not path to itself.
>> * Add compinit autoload command, since whole thing didn't work if it is
>> not loaded.
>>
>> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-814%2Fogonkov%2Fpatch-1-v1
>> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-814/ogonkov/patch-1-v1
>> Pull-Request: https://github.com/git/git/pull/814
>>
>> contrib/completion/git-completion.zsh | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
>> index ce47e86b60..107869036d 100644
>> --- a/contrib/completion/git-completion.zsh
>> +++ b/contrib/completion/git-completion.zsh
>> @@ -9,13 +9,14 @@
>> #
>> # If your script is somewhere else, you can configure it on your ~/.zshrc:
>> #
>> -# zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh
>> +# zstyle ':completion:*:*:git:*' script ~/.git-completion.bash
>> #
>> # 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
>> # to your ~/.zshrc file:
>> #
>> # fpath=(~/.zsh $fpath)
>> +# autoload -Uz compinit && compinit
>>
>> complete ()
>> {
>>
>> base-commit: a08a83db2bf27f015bec9a435f6d73e223c21c5e
>