bash completion: avoid space after options taking an argument

This makes branch and tag completion more useful.

diff --git a/debian/git-buildpackage.bash-completion b/debian/git-buildpackage.bash-completion
index 57b2675..8c61170 100644 (file)
--- a/debian/git-buildpackage.bash-completion
+++ b/debian/git-buildpackage.bash-completion
@@ -60,7 +60,12 @@ _gbp_comp ()
         return 0
     fi
 
-    COMPREPLY=($(compgen -W "$options" -- $cur))
+    # separate opts by tab so we can append a space to all options not ending
+    # with an equal sign
+    tab_opts=$(echo "$options" | sed -e 's/ \+/\t/g' -e 's/[^=]$/& /g')
+    type compopt &>/dev/null && compopt -o nospace
+    local IFS=$'\t\n'
+    COMPREPLY=($(compgen -W "$tab_opts" -- $cur))
 }