From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Jonathan Nieder" <jrnieder@gmail.com>,
"SZEDER Gábor" <szeder@ira.uka.de>,
"Junio C Hamano" <gitster@pobox.com>,
"Thomas Rast" <trast@student.ethz.ch>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [RFC/PATCH v4 4/6] completion: simplify command stuff
Date: Mon, 7 May 2012 03:23:18 +0200 [thread overview]
Message-ID: <1336353800-17323-5-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1336353800-17323-1-git-send-email-felipe.contreras@gmail.com>
No need to recalculate it.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/completion/git-completion.bash | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8de0358..e648d7c 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -723,7 +723,7 @@ __git_complete_revlist ()
__git_complete_remote_or_refspec ()
{
- local cur_="$cur" cmd="${words[1]}"
+ local cur_="$cur"
local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0
if [ "$cmd" = "remote" ]; then
((c++))
@@ -2603,22 +2603,22 @@ _git_whatchanged ()
_git ()
{
- local i c=1 command __git_dir
+ local i c=1 cmd __git_dir
while [ $c -lt $cword ]; do
i="${words[c]}"
case "$i" in
--git-dir=*) __git_dir="${i#--git-dir=}" ;;
--bare) __git_dir="." ;;
- --help) command="help"; break ;;
+ --help) cmd="help"; break ;;
-c) c=$((++c)) ;;
-*) ;;
- *) command="$i"; break ;;
+ *) cmd="$i"; break ;;
esac
((c++))
done
- if [ -z "$command" ]; then
+ if [ -z "$cmd" ]; then
case "$cur" in
--*) __gitcomp "
--paginate
@@ -2642,10 +2642,10 @@ _git ()
return
fi
- local completion_func="_git_${command//-/_}"
+ local completion_func="_git_${cmd//-/_}"
declare -f $completion_func >/dev/null && $completion_func && return
- local expansion=$(__git_aliased_command "$command")
+ local expansion=$(__git_aliased_command "$cmd")
if [ -n "$expansion" ]; then
completion_func="_git_${expansion//-/_}"
declare -f $completion_func >/dev/null && $completion_func
--
1.7.10
next prev parent reply other threads:[~2012-05-07 1:23 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-07 1:23 [RFC/PATCH v4 0/6] completion: __git_complete and other stuff Felipe Contreras
2012-05-07 1:23 ` [RFC/PATCH v4 1/6] completion: add new __git_complete helper Felipe Contreras
2012-05-07 9:51 ` SZEDER Gábor
2012-05-07 18:51 ` Junio C Hamano
2012-05-07 20:53 ` Felipe Contreras
2012-05-07 1:23 ` [RFC/PATCH v4 2/6] tests: add more bash completion tests Felipe Contreras
2012-05-07 1:23 ` [RFC/PATCH v4 3/6] completion: simplify _git_bundle Felipe Contreras
2012-05-07 1:23 ` Felipe Contreras [this message]
2012-05-07 10:08 ` [RFC/PATCH v4 4/6] completion: simplify command stuff SZEDER Gábor
2012-05-07 1:23 ` [RFC/PATCH v4 5/6] completion: calculate argument position properly Felipe Contreras
2012-05-07 1:27 ` Felipe Contreras
2012-05-07 18:59 ` Junio C Hamano
2012-05-07 21:01 ` Felipe Contreras
2012-05-07 21:52 ` Junio C Hamano
2012-05-08 12:50 ` Felipe Contreras
2012-05-07 1:23 ` [RFC/PATCH v4 6/6] completion: add public _GIT_complete helper Felipe Contreras
2012-05-07 18:56 ` Junio C Hamano
2012-05-07 20:57 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336353800-17323-5-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=szeder@ira.uka.de \
--cc=trast@student.ethz.ch \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.