On Mon, Nov 09, 2020 at 08:03:43PM -0600, Felipe Contreras wrote:
> We don't want to be stuck in an endless cycle.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
> ---
> contrib/completion/git-completion.bash | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index eb00d9ba22..ce0dc1e0f8 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1121,11 +1121,16 @@ __git_pretty_aliases ()
> # __git_aliased_command requires 1 argument
> __git_aliased_command ()
> {
> - local cur=$1 last word cmdline
> + local cur=$1 list word cmdline
>
> while [[ -n "$cur" ]]; do
> + if [[ "$list" == *"$cur "* ]]; then
I suspect the right hand side should be *" $cur "* ...
> + # loop detected
> + return
> + fi
> +
> cmdline=$(__git config --get "alias.$cur")
> - last=$cur
> + list="$cur $list"
... and this should be list=" $cur $list", because otherwise a partial
match is possible and would be mistaken for a loop (though I didn't
actually test whether that's indeed the case).
> cur=
>
> for word in $cmdline; do
> @@ -1149,7 +1154,7 @@ __git_aliased_command ()
> done
> done
>
> - cur=$last
> + cur="${list%% *}"
> if [[ "$cur" != "$1" ]]; then
> echo "$cur"
> fi
> --
> 2.29.2
>
