git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, "SZEDER Gábor" <szeder.dev@gmail.com>
Subject: Re: [PATCH] completion: bash: improve alias loop detection
Date: Tue, 17 Nov 2020 10:56:54 -0800	[thread overview]
Message-ID: <xmqqtutn6ccp.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201112223452.1526315-1-felipe.contreras@gmail.com> (Felipe Contreras's message of "Thu, 12 Nov 2020 16:34:52 -0600")

Felipe Contreras <felipe.contreras@gmail.com> writes:

> 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>
> ---
>  contrib/completion/git-completion.bash | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)

OK.  An extra local variable would not hurt and makes the code
easier to read.

Will queue.


> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index ce0dc1e0f8..cd2a02bafd 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1121,16 +1121,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
> @@ -1154,7 +1155,7 @@ __git_aliased_command ()
>  		done
>  	done
>  
> -	cur="${list%% *}"
> +	cur=$last
>  	if [[ "$cur" != "$1" ]]; then
>  		echo "$cur"
>  	fi

  reply	other threads:[~2020-11-17 18:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-12 22:34 Felipe Contreras
2020-11-17 18:56 ` Junio C Hamano [this message]
2020-11-17 19:52   ` Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqtutn6ccp.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=szeder.dev@gmail.com \
    --subject='Re: [PATCH] completion: bash: improve alias loop detection' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).