On 2020-05-26 at 19:13:17, Marco Trevisan via GitGitGadget wrote:
> From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@xxxxxxxxx>
>
> When clearing the builtin operations on re-sourcing in the ZSH case we
> can use the native ${parameters} associative array keys values to get
> the currently `__gitcomp_builtin_*` operations using pattern matching
> instead of using sed.
>
> As also stated in commit 94408dc7, introducing this change the usage of
> sed has some overhead implications, while ZSH can do this check just
> using its native syntax.
>
> Signed-off-by: Marco Trevisan (Treviño) <mail@xxxxxxxxx>
> ---
> completion: Use native ZSH array pattern matching
>
> When clearing the builtin operations on re-sourcing in the ZSH case we
> can use the native ${parameters} associative array keys values to get
> the currently __gitcomp_builtin_* operations using pattern matching
> instead of using sed.
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-645%2F3v1n0%2Fzsh-native-operation-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-645/3v1n0/zsh-native-operation-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/645
>
> contrib/completion/git-completion.bash | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 70ad04e1b2a..ad6934a3864 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -373,7 +373,7 @@ __gitcomp ()
> # Clear the variables caching builtins' options when (re-)sourcing
> # the completion script.
> 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
> + unset ${(M)${(k)parameters[@]}:#__gitcomp_builtin_*} 2>/dev/null
> else
> unset $(compgen -v __gitcomp_builtin_)
> fi
This file is necessarily used by both bash and zsh. Does bash
(including the bash 3 used on macOS) happen to continue to work with
this syntax?
We've had cases in the past where despite some code running under shell
A, shell B, which also parsed file, choked on the data because it
had to parse it even though it didn't execute it.
If so, and this works there, can you mention that in your commit message
for future readers?
--
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204
Attachment:
signature.asc
Description: PGP signature
