development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

completion: bash: improve alias loop detection

Browse source 
It is possible for the name of an alias to end with the name of another
alias, in which case the code will incorrectly detect a loop.

We can fix that by adding an extra space between words.

Suggested-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2020-11-12 16:34:52 -06:00 committed by Junio C Hamano
parent c2822a842d
commit e4c75edb52
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
contrib/completion/git-completion.bash
View file

@ -1120,16 +1120,17 @@ __git_pretty_aliases ()
# __git_aliased_command requires 1 argument
__git_aliased_command ()
{
local cur=$1 list word cmdline
local cur=$1 last list word cmdline
while [[ -n "$cur" ]]; do
if [[ "$list" == *"$cur "* ]]; then
if [[ "$list" == *" $cur "* ]]; then
# loop detected
return
fi
cmdline=$(__git config --get "alias.$cur")
list="$cur $list"
list=" $cur $list"
last=$cur
cur=
for word in $cmdline; do
@ -1153,7 +1154,7 @@ __git_aliased_command ()
done
done
cur="${list%% *}"
cur=$last
if [[ "$cur" != "$1" ]]; then
echo "$cur"
fi