diff options
| author | D. Ben Knoble <ben.knoble+github@gmail.com> | 2025-11-03 21:14:48 -0500 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2025-11-17 07:39:14 +0000 |
| commit | 461becdf9c346a56d88d4afbba0b3ca1468797a5 (patch) | |
| tree | 8a2ee515dd462959b030ae859ac91120b28b38a6 /dev-vcs/git/git-9999.ebuild | |
| parent | 802aabf486fabd2d4eab47009aeaff8fae728094 (diff) | |
| download | gentoo-461becdf9c346a56d88d4afbba0b3ca1468797a5.tar.gz gentoo-461becdf9c346a56d88d4afbba0b3ca1468797a5.tar.bz2 gentoo-461becdf9c346a56d88d4afbba0b3ca1468797a5.zip | |
dev-vcs/git: install upstream Zsh completions
Administrators can still filter out these completions with INSTALL_MASK,
and users or admins can adjust fpath if desired.
Whatever is earlier in fpath (that is, the first hit for
`ls $^fpath/_git`) wins. Git's completion goes to
/usr/share/zsh/site_functions or something similar, which is early on
the system fpath to allow overrides; meanwhile Zsh's completion is
fairly late on the default fpath.
So installing unconditionally means Git's script wins, without the
aforementioned customization.
Closes: https://bugs.gentoo.org/961079
Signed-off-by: D. Ben Knoble <ben.knoble+github@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44459
Closes: https://github.com/gentoo/gentoo/pull/44459
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-vcs/git/git-9999.ebuild')
| -rw-r--r-- | dev-vcs/git/git-9999.ebuild | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 3de51238c45f..a063ebf119e5 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python3_{11..14} ) -inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd meson +inherit toolchain-funcs perl-module shell-completion optfeature plocale python-single-r1 systemd meson PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" @@ -354,6 +354,7 @@ src_install() { newbashcomp contrib/completion/git-completion.bash ${PN} bashcomp_alias git gitk + newzshcomp contrib/completion/git-completion.zsh _${PN} # Not really a bash-completion file (bug #477920) # but still needed uncompressed (bug #507480) insinto /usr/share/${PN} @@ -470,6 +471,14 @@ pkg_postinst() { elog "Note that the prompt bash code is now in that separate script" fi + if has_version app-shells/zsh ; then + elog 'There are two competing zsh completions available for Git.' + elog 'One is from app-shells/zsh, the other from dev-vcs/git.' + elog 'To choose between them, order the entries of $fpath so that your' + elog 'desired completion is earlier in the list or symlink the relevant' + elog 'script into a personal override directory early on fpath.' + fi + optfeature_header "Some scripts require additional dependencies:" optfeature git-quiltimport dev-util/quilt optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx |