Skip to content

Commit

Permalink
Merge branch 'jk/more-push-completion'
Browse files Browse the repository at this point in the history
* jk/more-push-completion:
  completion: complete `git push --force-with-lease=`
  completion: add some missing options to `git push`
  completion: complete "unstuck" `git push --recurse-submodules`
  • Loading branch information
Junio C Hamano committed Jul 30, 2014
2 parents c372e7b + aaf7253 commit 0d9cb2d
Showing 1 changed file with 27 additions and 1 deletion.
28 changes: 27 additions & 1 deletion contrib/completion/git-completion.bash
Original file line number Diff line number Diff line change
Expand Up @@ -1621,12 +1621,33 @@ _git_pull ()

__git_push_recurse_submodules="check on-demand"

__git_complete_force_with_lease ()
{
local cur_=$1

case "$cur_" in
--*=)
;;
*:*)
__gitcomp_nl "$(__git_refs)" "" "${cur_#*:}"
;;
*)
__gitcomp_nl "$(__git_refs)" "" "$cur_"
;;
esac
}

_git_push ()
{
case "$prev" in
--repo)
__gitcomp_nl "$(__git_remotes)"
return
;;
--recurse-submodules)
__gitcomp "$__git_push_recurse_submodules"
return
;;
esac
case "$cur" in
--repo=*)
Expand All @@ -1637,11 +1658,16 @@ _git_push ()
__gitcomp "$__git_push_recurse_submodules" "" "${cur##--recurse-submodules=}"
return
;;
--force-with-lease=*)
__git_complete_force_with_lease "${cur##--force-with-lease=}"
return
;;
--*)
__gitcomp "
--all --mirror --tags --dry-run --force --verbose
--quiet --prune --delete --follow-tags
--receive-pack= --repo= --set-upstream
--recurse-submodules=
--force-with-lease --force-with-lease= --recurse-submodules=
"
return
;;
Expand Down

0 comments on commit 0d9cb2d

Please sign in to comment.