From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id C94A31F4B4 for ; Wed, 14 Oct 2020 15:10:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726708AbgJNPK0 (ORCPT ); Wed, 14 Oct 2020 11:10:26 -0400 Received: from dd36226.kasserver.com ([85.13.153.21]:58186 "EHLO dd36226.kasserver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726006AbgJNPK0 (ORCPT ); Wed, 14 Oct 2020 11:10:26 -0400 Received: from client3368.fritz.box (i5C745714.versanet.de [92.116.87.20]) by dd36226.kasserver.com (Postfix) with ESMTPSA id 79A3C3C0B29; Wed, 14 Oct 2020 17:10:24 +0200 (CEST) Subject: Re: [PATCH] Fix zsh installation instructions To: Junio C Hamano , Alexey via GitGitGadget Cc: git@vger.kernel.org, Alexey References: From: Stefan Haller Message-ID: Date: Wed, 14 Oct 2020 17:10:23 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 07.07.20 0:42, Junio C Hamano wrote: >> From: Alexey > > 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 >> - 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 >> --- >> 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 >