bash: Support completion on git-cherry.

I just realized I did not support ref name completion for git-cherry.
This tool is just too useful to contributors who submit patches
upstream by email; completion support for it is very handy.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 466cc32f4ce4254453f2083e5a0619827971410f..b434332bf7c9bbf58ca82ef0b1804441eaf2b65c 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -415,6 +415,11 @@ _git_checkout ()
        __gitcomp "$(__git_refs)"
 }
 
        __gitcomp "$(__git_refs)"
 }
 

+_git_cherry ()
+{
+       __gitcomp "$(__git_refs)"
+}
+

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


@@ -867,6 +872,7 @@ _git ()
        apply)       _git_apply ;;
        branch)      _git_branch ;;
        checkout)    _git_checkout ;;
        apply)       _git_apply ;;
        branch)      _git_branch ;;
        checkout)    _git_checkout ;;

+       cherry)      _git_cherry ;;

        cherry-pick) _git_cherry_pick ;;
        commit)      _git_commit ;;
        config)      _git_config ;;
        cherry-pick) _git_cherry_pick ;;
        commit)      _git_commit ;;
        config)      _git_config ;;


@@ -909,6 +915,7 @@ complete -o default -o nospace -F _git_am git-am
 complete -o default -o nospace -F _git_apply git-apply
 complete -o default -o nospace -F _git_branch git-branch
 complete -o default -o nospace -F _git_checkout git-checkout
 complete -o default -o nospace -F _git_apply git-apply
 complete -o default -o nospace -F _git_branch git-branch
 complete -o default -o nospace -F _git_checkout git-checkout

+complete -o default -o nospace -F _git_cherry git-cherry

 complete -o default -o nospace -F _git_cherry_pick git-cherry-pick
 complete -o default -o nospace -F _git_commit git-commit
 complete -o default -o nospace -F _git_diff git-diff
 complete -o default -o nospace -F _git_cherry_pick git-cherry-pick
 complete -o default -o nospace -F _git_commit git-commit
 complete -o default -o nospace -F _git_diff git-diff


@@ -939,6 +946,7 @@ complete -o default -o nospace -F _git_add git-add.exe
 complete -o default -o nospace -F _git_apply git-apply.exe
 complete -o default -o nospace -F _git git.exe
 complete -o default -o nospace -F _git_branch git-branch.exe
 complete -o default -o nospace -F _git_apply git-apply.exe
 complete -o default -o nospace -F _git git.exe
 complete -o default -o nospace -F _git_branch git-branch.exe

+complete -o default -o nospace -F _git_cherry git-cherry.exe

 complete -o default -o nospace -F _git_diff git-diff.exe
 complete -o default -o nospace -F _git_diff_tree git-diff-tree.exe
 complete -o default -o nospace -F _git_format_patch git-format-patch.exe
 complete -o default -o nospace -F _git_diff git-diff.exe
 complete -o default -o nospace -F _git_diff_tree git-diff-tree.exe
 complete -o default -o nospace -F _git_format_patch git-format-patch.exe