Teach bash how to complete long options for git-commit.

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 d8ae4d7886d77328a0ec4d09663e33c202f9b8fe..be978cf3d3d5f4368a882596ed152f94f6affb32 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -398,6 +398,20 @@ _git_cherry_pick ()
        esac
 }
 
        esac
 }
 

+_git_commit ()
+{
+       local cur="${COMP_WORDS[COMP_CWORD]}"
+       case "$cur" in
+       --*)
+               COMPREPLY=($(compgen -W "
+                       --all --author= --signoff --verify --no-verify
+                       --edit --amend --include --only
+                       " -- "$cur"))
+               return
+       esac
+       COMPREPLY=()
+}
+

 _git_diff ()
 {
        __git_complete_file
 _git_diff ()
 {
        __git_complete_file


@@ -768,6 +782,7 @@ _git ()
        cat-file)    _git_cat_file ;;
        checkout)    _git_checkout ;;
        cherry-pick) _git_cherry_pick ;;
        cat-file)    _git_cat_file ;;
        checkout)    _git_checkout ;;
        cherry-pick) _git_cherry_pick ;;

+       commit)      _git_commit ;;

        diff)        _git_diff ;;
        diff-tree)   _git_diff_tree ;;
        fetch)       _git_fetch ;;
        diff)        _git_diff ;;
        diff-tree)   _git_diff_tree ;;
        fetch)       _git_fetch ;;


@@ -804,6 +819,7 @@ complete -o default            -F _git_branch git-branch
 complete -o default -o nospace -F _git_cat_file git-cat-file
 complete -o default            -F _git_checkout git-checkout
 complete -o default            -F _git_cherry_pick git-cherry-pick
 complete -o default -o nospace -F _git_cat_file git-cat-file
 complete -o default            -F _git_checkout git-checkout
 complete -o default            -F _git_cherry_pick git-cherry-pick

+complete -o default            -F _git_commit git-commit

 complete -o default -o nospace -F _git_diff git-diff
 complete -o default            -F _git_diff_tree git-diff-tree
 complete -o default -o nospace -F _git_fetch git-fetch
 complete -o default -o nospace -F _git_diff git-diff
 complete -o default            -F _git_diff_tree git-diff-tree
 complete -o default -o nospace -F _git_fetch git-fetch