completion: teach --recurse-submodules to fetch, pull and push

Signed-off-by: Sup Yut Sum <ch3cooli@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 8aaf214b7da7b45cc4018c5faac8e08d772547b4..c044a68d229aab6d15b9c0ae00334bb9f4f03575 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1221,14 +1221,20 @@ _git_difftool ()
        __git_complete_revlist_file
 }
 
        __git_complete_revlist_file
 }
 

+__git_fetch_recurse_submodules="yes on-demand no"
+

 __git_fetch_options="
        --quiet --verbose --append --upload-pack --force --keep --depth=
 __git_fetch_options="
        --quiet --verbose --append --upload-pack --force --keep --depth=

-       --tags --no-tags --all --prune --dry-run
+       --tags --no-tags --all --prune --dry-run --recurse-submodules=

 "
 
 _git_fetch ()
 {
        case "$cur" in
 "
 
 _git_fetch ()
 {
        case "$cur" in

+       --recurse-submodules=*)
+               __gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
+               return
+               ;;

        --*)
                __gitcomp "$__git_fetch_options"
                return
        --*)
                __gitcomp "$__git_fetch_options"
                return


@@ -1577,6 +1583,10 @@ _git_pull ()
        __git_complete_strategy && return
 
        case "$cur" in
        __git_complete_strategy && return
 
        case "$cur" in

+       --recurse-submodules=*)
+               __gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
+               return
+               ;;

        --*)
                __gitcomp "
                        --rebase --no-rebase
        --*)
                __gitcomp "
                        --rebase --no-rebase


@@ -1589,6 +1599,8 @@ _git_pull ()
        __git_complete_remote_or_refspec
 }
 
        __git_complete_remote_or_refspec
 }
 

+__git_push_recurse_submodules="check on-demand"
+

 _git_push ()
 {
        case "$prev" in
 _git_push ()
 {
        case "$prev" in


@@ -1601,10 +1613,15 @@ _git_push ()
                __gitcomp_nl "$(__git_remotes)" "" "${cur##--repo=}"
                return
                ;;
                __gitcomp_nl "$(__git_remotes)" "" "${cur##--repo=}"
                return
                ;;

+       --recurse-submodules=*)
+               __gitcomp "$__git_push_recurse_submodules" "" "${cur##--recurse-submodules=}"
+               return
+               ;;

        --*)
                __gitcomp "
                        --all --mirror --tags --dry-run --force --verbose
                        --receive-pack= --repo= --set-upstream
        --*)
                __gitcomp "
                        --all --mirror --tags --dry-run --force --verbose
                        --receive-pack= --repo= --set-upstream

+                       --recurse-submodules=

                "
                return
                ;;
                "
                return
                ;;