Merge pull request #98012 from NixOS/revert-79578-git-zsh-completion

Revert "git: enable zsh completion"
This commit is contained in:
WORLDofPEACE 2020-09-15 00:39:24 -04:00 committed by GitHub
commit ddfedf45cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -155,12 +155,6 @@ stdenv.mkDerivation {
ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git
mkdir -p $out/etc/bash_completion.d mkdir -p $out/etc/bash_completion.d
ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/ ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/
mkdir -p $out/share/zsh/site-functions
ln -s $out/share/git/contrib/completion/git-completion.zsh $out/share/zsh/site-functions/_git
# Patch the zsh completion script so it can find the Bash completion script.
sed -i -e "/locations=(/a \${"\t\t"}'$out/share/git/contrib/completion/git-completion.bash'" \
$out/share/git/contrib/completion/git-completion.zsh
# grep is a runtime dependency, need to patch so that it's found # grep is a runtime dependency, need to patch so that it's found
substituteInPlace $out/libexec/git-core/git-sh-setup \ substituteInPlace $out/libexec/git-core/git-sh-setup \