completion: get rid of empty COMPREPLY assignments

There's no functional reason for those, the only purpose they are
supposed to serve is to say "we don't provide any words here", but
even for that it's not used consistently.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 8ad842e462d4188581c6c12197d9582811a74752..d1b731cf65302490f8855f0796382804ccefa1c8 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -208,7 +208,6 @@ __gitcomp ()
 
        case "$cur_" in
        --*=)
 
        case "$cur_" in
        --*=)

-               COMPREPLY=()

                ;;
        *)
                local IFS=$'\n'
                ;;
        *)
                local IFS=$'\n'


@@ -614,7 +613,6 @@ __git_complete_remote_or_refspec ()
                        case "$cmd" in
                        push) no_complete_refspec=1 ;;
                        fetch)
                        case "$cmd" in
                        push) no_complete_refspec=1 ;;
                        fetch)

-                               COMPREPLY=()

                                return
                                ;;
                        *) ;;
                                return
                                ;;
                        *) ;;


@@ -630,7 +628,6 @@ __git_complete_remote_or_refspec ()
                return
        fi
        if [ $no_complete_refspec = 1 ]; then
                return
        fi
        if [ $no_complete_refspec = 1 ]; then

-               COMPREPLY=()

                return
        fi
        [ "$remote" = "." ] && remote=
                return
        fi
        [ "$remote" = "." ] && remote=


@@ -951,7 +948,6 @@ _git_am ()
                        "
                return
        esac
                        "
                return
        esac

-       COMPREPLY=()

 }
 
 _git_apply ()
 }
 
 _git_apply ()


@@ -971,7 +967,6 @@ _git_apply ()
                        "
                return
        esac
                        "
                return
        esac

-       COMPREPLY=()

 }
 
 _git_add ()
 }
 
 _git_add ()


@@ -1031,7 +1026,6 @@ _git_bisect ()
                __gitcomp_nl "$(__git_refs)"
                ;;
        *)
                __gitcomp_nl "$(__git_refs)"
                ;;
        *)

-               COMPREPLY=()

                ;;
        esac
 }
                ;;
        esac
 }


@@ -1175,7 +1169,6 @@ _git_clone ()
                return
                ;;
        esac
                return
                ;;
        esac

-       COMPREPLY=()

 }
 
 _git_commit ()
 }
 
 _git_commit ()


@@ -1359,7 +1352,6 @@ _git_fsck ()
                return
                ;;
        esac
                return
                ;;
        esac

-       COMPREPLY=()

 }
 
 _git_gc ()
 }
 
 _git_gc ()


@@ -1370,7 +1362,6 @@ _git_gc ()
                return
                ;;
        esac
                return
                ;;
        esac

-       COMPREPLY=()

 }
 
 _git_gitk ()
 }
 
 _git_gitk ()


@@ -1447,7 +1438,6 @@ _git_init ()
                return
                ;;
        esac
                return
                ;;
        esac

-       COMPREPLY=()

 }
 
 _git_ls_files ()
 }
 
 _git_ls_files ()


@@ -1583,7 +1573,6 @@ _git_mergetool ()
                return
                ;;
        esac
                return
                ;;
        esac

-       COMPREPLY=()

 }
 
 _git_merge_base ()
 }
 
 _git_merge_base ()


@@ -1896,7 +1885,6 @@ _git_config ()
                return
                ;;
        *.*)
                return
                ;;
        *.*)

-               COMPREPLY=()

                return
                ;;
        esac
                return
                ;;
        esac


@@ -2277,7 +2265,6 @@ _git_remote ()
                __gitcomp "$c"
                ;;
        *)
                __gitcomp "$c"
                ;;
        *)

-               COMPREPLY=()

                ;;
        esac
 }
                ;;
        esac
 }


@@ -2393,8 +2380,6 @@ _git_stash ()
                *)
                        if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
                                __gitcomp "$subcommands"
                *)
                        if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
                                __gitcomp "$subcommands"

-                       else
-                               COMPREPLY=()

                        fi
                        ;;
                esac
                        fi
                        ;;
                esac


@@ -2407,14 +2392,12 @@ _git_stash ()
                        __gitcomp "--index --quiet"
                        ;;
                show,--*|drop,--*|branch,--*)
                        __gitcomp "--index --quiet"
                        ;;
                show,--*|drop,--*|branch,--*)

-                       COMPREPLY=()

                        ;;
                show,*|apply,*|drop,*|pop,*|branch,*)
                        __gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
                                        | sed -n -e 's/:.*//p')"
                        ;;
                *)
                        ;;
                show,*|apply,*|drop,*|pop,*|branch,*)
                        __gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
                                        | sed -n -e 's/:.*//p')"
                        ;;
                *)

-                       COMPREPLY=()

                        ;;
                esac
        fi
                        ;;
                esac
        fi


@@ -2531,7 +2514,6 @@ _git_svn ()
                        __gitcomp "--revision= --parent"
                        ;;
                *)
                        __gitcomp "--revision= --parent"
                        ;;
                *)

-                       COMPREPLY=()

                        ;;
                esac
        fi
                        ;;
                esac
        fi


@@ -2556,13 +2538,10 @@ _git_tag ()
 
        case "$prev" in
        -m|-F)
 
        case "$prev" in
        -m|-F)

-               COMPREPLY=()

                ;;
        -*|tag)
                if [ $f = 1 ]; then
                        __gitcomp_nl "$(__git_tags)"
                ;;
        -*|tag)
                if [ $f = 1 ]; then
                        __gitcomp_nl "$(__git_tags)"

-               else
-                       COMPREPLY=()

                fi
                ;;
        *)
                fi
                ;;
        *)