From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Philippe Blain" <levraiphilippeblain@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Jeff King" <peff@peff.net>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v2 3/3] completion: bash: simplify __git_aliased_command
Date: Mon, 9 Nov 2020 18:53:31 -0600 [thread overview]
Message-ID: <20201110005331.532678-4-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20201110005331.532678-1-felipe.contreras@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/completion/git-completion.bash | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index bf2a59f95e..ce0dc1e0f8 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1121,17 +1121,17 @@ __git_pretty_aliases ()
# __git_aliased_command requires 1 argument
__git_aliased_command ()
{
- local cur=$1 last list word cmdline
+ local cur=$1 list word cmdline
- while [[ "$cur" != "$last" ]]; do
+ 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
case "$word" in
@@ -1154,6 +1154,7 @@ __git_aliased_command ()
done
done
+ cur="${list%% *}"
if [[ "$cur" != "$1" ]]; then
echo "$cur"
fi
--
2.29.2
next prev parent reply other threads:[~2020-11-10 0:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-10 0:53 [PATCH v2 0/3] completion: bash: support for recursive/nested aliases Felipe Contreras
2020-11-10 0:53 ` [PATCH v2 1/3] completion: bash: support recursive aliases Felipe Contreras
2020-11-10 0:53 ` [PATCH v2 2/3] completion: bash: check for alias loop Felipe Contreras
2020-11-10 0:53 ` Felipe Contreras [this message]
2020-11-10 1:47 ` [PATCH v2 0/3] completion: bash: support for recursive/nested aliases Junio C Hamano
2020-11-10 2:09 ` 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=20201110005331.532678-4-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=levraiphilippeblain@gmail.com \
--cc=peff@peff.net \
--cc=szeder.dev@gmail.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).