bash: remove fetch, push, pull dashed form leftovers

We don't provide complation for git-commands in dashed form anymore,
so there is no need to keep those cases.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Tested-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3bc45f6b47837489f36e34b7af43f2be52838272..751e273e1aeecd382bc584fcb80b2ed6f52ed862 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -799,14 +799,9 @@ _git_fetch ()
 {
        local cur="${COMP_WORDS[COMP_CWORD]}"
 
 {
        local cur="${COMP_WORDS[COMP_CWORD]}"
 

-       case "${COMP_WORDS[0]},$COMP_CWORD" in
-       git-fetch*,1)
+       if [ "$COMP_CWORD" = 2 ]; then

                __gitcomp "$(__git_remotes)"
                __gitcomp "$(__git_remotes)"

-               ;;
-       git,2)
-               __gitcomp "$(__git_remotes)"
-               ;;
-       *)
+       else

                case "$cur" in
                *:*)
                        local pfx=""
                case "$cur" in
                *:*)
                        local pfx=""


@@ -825,8 +820,7 @@ _git_fetch ()
                        __gitcomp "$(__git_refs2 "$remote")"
                        ;;
                esac
                        __gitcomp "$(__git_refs2 "$remote")"
                        ;;
                esac

-               ;;
-       esac
+       fi

 }
 
 _git_format_patch ()
 }
 
 _git_format_patch ()


@@ -1063,36 +1057,25 @@ _git_pull ()
 {
        local cur="${COMP_WORDS[COMP_CWORD]}"
 
 {
        local cur="${COMP_WORDS[COMP_CWORD]}"
 

-       case "${COMP_WORDS[0]},$COMP_CWORD" in
-       git-pull*,1)
-               __gitcomp "$(__git_remotes)"
-               ;;
-       git,2)
+       if [ "$COMP_CWORD" = 2 ]; then

                __gitcomp "$(__git_remotes)"
                __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")"
                local remote
                case "${COMP_WORDS[0]}" in
                git-pull)  remote="${COMP_WORDS[1]}" ;;
                git)       remote="${COMP_WORDS[2]}" ;;
                esac
                __gitcomp "$(__git_refs "$remote")"

-               ;;
-       esac
+       fi

 }
 
 _git_push ()
 {
        local cur="${COMP_WORDS[COMP_CWORD]}"
 
 }
 
 _git_push ()
 {
        local cur="${COMP_WORDS[COMP_CWORD]}"
 

-       case "${COMP_WORDS[0]},$COMP_CWORD" in
-       git-push*,1)
-               __gitcomp "$(__git_remotes)"
-               ;;
-       git,2)
+       if [ "$COMP_CWORD" = 2 ]; then

                __gitcomp "$(__git_remotes)"
                __gitcomp "$(__git_remotes)"

-               ;;
-       *)
+       else

                case "$cur" in
                *:*)
                        local remote
                case "$cur" in
                *:*)
                        local remote


@@ -1116,8 +1099,7 @@ _git_push ()
                        __gitcomp "$(__git_refs)"
                        ;;
                esac
                        __gitcomp "$(__git_refs)"
                        ;;
                esac

-               ;;
-       esac
+       fi

 }
 
 _git_rebase ()
 }
 
 _git_rebase ()