Merge branch 'jn/gitweb-customlinks'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index eebe73409bebb8e8c2bb448f1612117cabf8d2ad..de193ba7c1caf69367410d763f3541555a64746f 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1398,6 +1398,8 @@ _git_shortlog ()
 
 _git_show ()
 {
+       __git_has_doubledash && return
+
        local cur="${COMP_WORDS[COMP_CWORD]}"
        case "$cur" in
        --pretty=*)