From c2822a842dc993722a9d6f8226189312b95d8801 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Mon, 9 Nov 2020 20:03:43 -0600 Subject: completion: bash: check for alias loop We don't want to be stuck in an endless cycle. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- 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 97eccffa4a..8fcf464bc3 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1120,11 +1120,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 + # loop detected + return + fi + cmdline=$(__git config --get "alias.$cur") - last=$cur + list="$cur $list" cur= for word in $cmdline; do @@ -1148,7 +1153,7 @@ __git_aliased_command () done done - cur=$last + cur="${list%% *}" if [[ "$cur" != "$1" ]]; then echo "$cur" fi -- cgit v1.2.3