summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-12-08 23:11:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-12-08 23:11:22 (GMT)
commit7d92da37871dceb732a56f5a3aecf0be872a40ab (patch)
tree9250b7436625cc3bfb32bcbadc8f9513881b6186 /contrib
parent90051e5b5e63d415fad6d38b999b9a0582189a4b (diff)
parent076496457e1abe3058d48cb5c387d1face704494 (diff)
downloadgit-7d92da37871dceb732a56f5a3aecf0be872a40ab.zip
git-7d92da37871dceb732a56f5a3aecf0be872a40ab.tar.gz
git-7d92da37871dceb732a56f5a3aecf0be872a40ab.tar.bz2
Merge branch 'fc/zsh-completion'
Hotfix for a recent breakage. * fc/zsh-completion: completion: bash: fix gitk alias regression completion: zsh: fix file completion regression
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash2
-rw-r--r--contrib/completion/git-completion.zsh1
2 files changed, 2 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1ed0362..463a312 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1829,7 +1829,7 @@ _git_fsck ()
_git_gitk ()
{
- _gitk
+ __gitk_main
}
# Lists matching symbol names from a tag (as in ctags) file.
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index e0fda27..6c56296 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -116,6 +116,7 @@ __gitcomp_file ()
{
emulate -L zsh
+ compset -P '*[=:]'
compadd -f -p "${2-}" -- ${(f)1} && _ret=0
}