git-svn: teach dcommit about svn auto-props

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e20d57a1ba82d9356630912f92d1cf1713309685..40b3d99737536c3cd85dece7b61d62d8977b43aa 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -626,6 +626,8 @@ _git_bundle ()
 
 _git_checkout ()
 {
+       __git_has_doubledash && return
+
        __gitcomp "$(__git_refs)"
 }
 
@@ -1224,6 +1226,22 @@ _git_show ()
        __git_complete_file
 }
 
+_git_show_branch ()
+{
+       local cur="${COMP_WORDS[COMP_CWORD]}"
+       case "$cur" in
+       --*)
+               __gitcomp "
+                       --all --remotes --topo-order --current --more=
+                       --list --independent --merge-base --no-name
+                       --sha1-name --topics --reflog
+                       "
+               return
+               ;;
+       esac
+       __git_complete_revlist
+}
+
 _git_stash ()
 {
        local subcommands='save list show apply clear drop pop create'
@@ -1443,7 +1461,7 @@ _git ()
        send-email)  _git_send_email ;;
        shortlog)    _git_shortlog ;;
        show)        _git_show ;;
-       show-branch) _git_log ;;
+       show-branch) _git_show_branch ;;
        stash)       _git_stash ;;
        submodule)   _git_submodule ;;
        svn)         _git_svn ;;