Merge branch 'ss/completion-rec-sub-fetch-push'

* ss/completion-rec-sub-fetch-push:
  completion: teach --recurse-submodules to fetch, pull and push
This commit is contained in:
Junio C Hamano 2014-03-14 14:24:15 -07:00
commit baf9e83c21

View File

@ -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=" __git_fetch_options="
--quiet --verbose --append --upload-pack --force --keep --depth= --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 () _git_fetch ()
{ {
case "$cur" in case "$cur" in
--recurse-submodules=*)
__gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
return
;;
--*) --*)
__gitcomp "$__git_fetch_options" __gitcomp "$__git_fetch_options"
return return
@ -1583,6 +1589,10 @@ _git_pull ()
__git_complete_strategy && return __git_complete_strategy && return
case "$cur" in case "$cur" in
--recurse-submodules=*)
__gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
return
;;
--*) --*)
__gitcomp " __gitcomp "
--rebase --no-rebase --rebase --no-rebase
@ -1595,6 +1605,8 @@ _git_pull ()
__git_complete_remote_or_refspec __git_complete_remote_or_refspec
} }
__git_push_recurse_submodules="check on-demand"
_git_push () _git_push ()
{ {
case "$prev" in case "$prev" in
@ -1607,10 +1619,15 @@ _git_push ()
__gitcomp_nl "$(__git_remotes)" "" "${cur##--repo=}" __gitcomp_nl "$(__git_remotes)" "" "${cur##--repo=}"
return return
;; ;;
--recurse-submodules=*)
__gitcomp "$__git_push_recurse_submodules" "" "${cur##--recurse-submodules=}"
return
;;
--*) --*)
__gitcomp " __gitcomp "
--all --mirror --tags --dry-run --force --verbose --all --mirror --tags --dry-run --force --verbose
--receive-pack= --repo= --set-upstream --receive-pack= --repo= --set-upstream
--recurse-submodules=
" "
return return
;; ;;