@@ -412,9 +412,16 @@ __git_complete_revlist () __git_complete_remote_or_refspec () { - local cmd="${COMP_WORDS[1]}" + local cmd="${COMP_WORDS[0]}" local cur="${COMP_WORDS[COMP_CWORD]}" - local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0 + local i c=1 remote="" pfx="" lhs=1 no_complete_refspec=0 + + # adjust args upward when completing git * + [ "$cmd" = "git" ] && { + cmd="${COMP_WORDS[1]}" + c=2 + } + while [ $c -lt $COMP_CWORD ]; do i="${COMP_WORDS[c]}" case "$i" in @@ -792,7 +799,7 @@ _git_branch () _git_bundle () { - local cmd="${COMP_WORDS[2]}" + local cmd="${COMP_WORDS[1]}" case "$COMP_CWORD" in 2) __gitcomp "create list-heads verify unbundle" git-completion.bash ccc750693ec82be690baf44bdd06dd633399e460 Ryan Tomayko r@tomayko.com http://github.com/rtomayko/git-sh/commit/bedba53ef0cd363549712df81f576048f126eb81 bedba53ef0cd363549712df81f576048f126eb81 2009-11-08T04:01:06-08:00 2009-11-08T04:01:05-08:00 fix fetch, pull, push refspec completion regressed when we upgraded. 34a87e68cce6d8b62953f9a60fd3e54123564c70 Ryan Tomayko r@tomayko.com