diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:25 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:25 +0900 |
| commit | 1dfb929a37bcb1456832753ec073a3fb5a27ffd0 (patch) | |
| tree | ad8e146f967c358eba518256fdf69b8285dcf7f6 | |
| parent | Merge branch 'sb/worktree-remove-opt-force' (diff) | |
| parent | completion: reduce overhead of clearing cached --options (diff) | |
| download | tgif-1dfb929a37bcb1456832753ec073a3fb5a27ffd0.tar.xz | |
Merge branch 'sg/completion-clear-cached'
The completion script (in contrib/) learned to clear cached list of
command line options upon dot-sourcing it again in a more efficient
way.
* sg/completion-clear-cached:
completion: reduce overhead of clearing cached --options
| -rw-r--r-- | contrib/completion/git-completion.bash | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 86a13fca28..159e6407df 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -284,7 +284,11 @@ __gitcomp () # Clear the variables caching builtins' options when (re-)sourcing # the completion script. -unset $(set |sed -ne 's/^\(__gitcomp_builtin_[a-zA-Z0-9_][a-zA-Z0-9_]*\)=.*/\1/p') 2>/dev/null +if [[ -n ${ZSH_VERSION-} ]]; then + unset $(set |sed -ne 's/^\(__gitcomp_builtin_[a-zA-Z0-9_][a-zA-Z0-9_]*\)=.*/\1/p') 2>/dev/null +else + unset $(compgen -v __gitcomp_builtin_) +fi # This function is equivalent to # |