diff mbox series

[v7,06/49] zsh: resolve symlink of script

Message ID	20230401084626.304356-7-felipe.contreras@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@vger.kernel.org> From: Felipe Contreras <felipe.contreras@gmail.com> To: git@vger.kernel.org Cc: Michael Bianco <iloveitaly@gmail.com>, Felipe Contreras <felipe.contreras@gmail.com> Subject: [PATCH v7 06/49] zsh: resolve symlink of script Date: Sat, 1 Apr 2023 02:45:43 -0600 Message-Id: <20230401084626.304356-7-felipe.contreras@gmail.com> In-Reply-To: <20230401084626.304356-1-felipe.contreras@gmail.com> References: <20230401084626.304356-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	completion: git-completion 2.0 patches \| expand [v7,00/49] completion: git-completion 2.0 patches [v7,01/49] test: completion add test for __git_cmd_idx [v7,02/49] completion: bash: trivial cleanup [v7,03/49] zsh: remove version [v7,04/49] completion: bash: trivial grammar fix [v7,05/49] completion: zsh: add higher-priority location [v7,06/49] zsh: resolve symlink of script [v7,07/49] zsh: simplify realpath dirname idiom [v7,08/49] test: completion: use global config [v7,09/49] completion: fix __git_cmd_idx regression for zsh [v7,10/49] completion: fix for suboptions with value [v7,11/49] completion: zsh: trivial improvement [v7,12/49] completion: bash: do not modify COMP_WORDBREAKS [v7,13/49] test: completion: fix currently typed words [v7,14/49] test: completion: switch __gitcomp_nl prefix test [v7,15/49] test: completion: add run_func() helper [v7,16/49] completion: bash: remove non-append functionality [v7,17/49] completion: bash: get rid of _append() functions [v7,18/49] completion: bash: get rid of any non-append code [v7,19/49] completion: zsh: fix options with arguments [v7,20/49] completion: zsh: expand --git-dir file argument [v7,21/49] completion: zsh: add support for general -C opts [v7,22/49] completion: zsh: fix for undefined completions [v7,23/49] completion: zsh: add support for general -c opts [v7,24/49] completion: zsh: fix extra space on foo= [v7,25/49] completion: zsh: add excluded options [v7,26/49] completion: zsh: always set compset [v7,27/49] completion: factor out check in __gitcomp [v7,28/49] completion: simplify equal suffix check [v7,29/49] completion: refactor __gitcomp [v7,30/49] completion: simplify __gitcomp [v7,31/49] completion: bash: change suffix check in __gitcomp [v7,32/49] completion: improve __gitcomp suffix code [v7,33/49] test: completion: add missing test [v7,34/49] completion: bash: simplify config_variable_name [v7,35/49] completion: bash: improve __gitcomp description [v7,36/49] completion: add __gitcomp_opts [v7,37/49] completion: bash: cleanup __gitcomp* invocations [v7,38/49] completion: bash: shuffle __gitcomp functions [v7,39/49] completion: zsh: simplify __gitcomp_direct [v7,40/49] completion: zsh: shuffle __gitcomp* functions [v7,41/49] completion: zsh: fix direct quoting [v7,42/49] completion: zsh: add elements individually in __gitcomp_opts [v7,43/49] completion: zsh: add __gitcompadd helper [v7,44/49] completion: zsh: add correct removable suffix [v7,45/49] completion: bash: simplify _get_comp_words_by_ref() [v7,46/49] completion: bash: refactor _get_comp_words_by_ref() [v7,47/49] completion: bash: cleanup _get_comp_words_by_ref() [v7,48/49] completion: bash: trivial cleanup [v7,49/49] completion: bash: rename _get_comp_words_by_ref()

Commit Message

Felipe Contreras April 1, 2023, 8:45 a.m. UTC

From: Michael Bianco <iloveitaly@gmail.com>

When using zinit the completions are symlinked to ~/.zinit/completions,
this causes the zsh script to not be able to find the bash script.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index 5f2c63236d..75bb44d41a 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -33,7 +33,7 @@  if [ -z "$script" ]; then
 		bash_completion='/usr/share/bash-completion/completions/'
 
 	locations=(
-		"$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
+		"$(dirname $(realpath ${funcsourcetrace[1]%:*}))"/git-completion.bash
 		"$HOME/.local/share/bash-completion/completions/git"
 		'/usr/local/share/bash-completion/completions/git'
 		"$bash_completion/git"