Skip to content

Commit

Permalink
bash: remove dashed command leftovers
Browse files Browse the repository at this point in the history
Commit 5a625b0 (bash: remove fetch, push, pull dashed form leftovers,
2008-10-03) did that already, but there were still some git-cmd left
here and there.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
SZEDER Gábor authored and Junio C Hamano committed Nov 28, 2008
1 parent b21a226 commit 8d8163f
Showing 1 changed file with 8 additions and 33 deletions.
41 changes: 8 additions & 33 deletions contrib/completion/git-completion.bash
Original file line number Diff line number Diff line change
Expand Up @@ -650,21 +650,12 @@ _git_branch ()

_git_bundle ()
{
local mycword="$COMP_CWORD"
case "${COMP_WORDS[0]}" in
git)
local cmd="${COMP_WORDS[2]}"
mycword="$((mycword-1))"
;;
git-bundle*)
local cmd="${COMP_WORDS[1]}"
;;
esac
case "$mycword" in
1)
local cmd="${COMP_WORDS[2]}"
case "$COMP_CWORD" in
2)
__gitcomp "create list-heads verify unbundle"
;;
2)
3)
# looking for a file
;;
*)
Expand Down Expand Up @@ -812,12 +803,7 @@ _git_fetch ()
__gitcomp "$(__git_refs)" "$pfx" "${cur#*:}"
;;
*)
local remote
case "${COMP_WORDS[0]}" in
git-fetch) remote="${COMP_WORDS[1]}" ;;
git) remote="${COMP_WORDS[2]}" ;;
esac
__gitcomp "$(__git_refs2 "$remote")"
__gitcomp "$(__git_refs2 "${COMP_WORDS[2]}")"
;;
esac
fi
Expand Down Expand Up @@ -1060,12 +1046,7 @@ _git_pull ()
if [ "$COMP_CWORD" = 2 ]; then
__gitcomp "$(__git_remotes)"
else
local remote
case "${COMP_WORDS[0]}" in
git-pull) remote="${COMP_WORDS[1]}" ;;
git) remote="${COMP_WORDS[2]}" ;;
esac
__gitcomp "$(__git_refs "$remote")"
__gitcomp "$(__git_refs "${COMP_WORDS[2]}")"
fi
}

Expand All @@ -1078,19 +1059,13 @@ _git_push ()
else
case "$cur" in
*:*)
local remote
case "${COMP_WORDS[0]}" in
git-push) remote="${COMP_WORDS[1]}" ;;
git) remote="${COMP_WORDS[2]}" ;;
esac

local pfx=""
case "$COMP_WORDBREAKS" in
*:*) : great ;;
*) pfx="${cur%%:*}:" ;;
esac

__gitcomp "$(__git_refs "$remote")" "$pfx" "${cur#*:}"
__gitcomp "$(__git_refs "${COMP_WORDS[2]}")" "$pfx" "${cur#*:}"
;;
+*)
__gitcomp "$(__git_refs)" + "${cur#+}"
Expand Down Expand Up @@ -1591,7 +1566,7 @@ _git_tag ()
-m|-F)
COMPREPLY=()
;;
-*|tag|git-tag)
-*|tag)
if [ $f = 1 ]; then
__gitcomp "$(__git_tags)"
else
Expand Down

0 comments on commit 8d8163f

Please sign in to comment.