Re: Remove space added by completion

[Oliver Kiddle <okiddle@xxxxxxxxxxx>]

On 14 Feb, Aaron Schrab wrote:
> >} I don't know about the original poster, but one place where I often
> >} don't want a space after a completion is with git branch names, to make

> If there's a way to get these arguments passed through the call to 
> _alternative in __git_commits, I think it would be an improvement to 
> change the actual arguments used.

How about the following? This just uses zparseopts to get the suffixes
and puts them in to each of the alternatives. The trickiest part is
quoting. I've also added a compset -S call to handle an existing suffix.

Oliver

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index a2cbf74..cfdbc4f 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5526,10 +5526,13 @@ __git_remote_branch_names_noprefix () {
 __git_commits () {
   # TODO: deal with things that __git_heads and __git_tags has in common (i.e.,
   # if both exists, they need to be completed to heads/x and tags/x.
+  local -a sopts ropt
+  zparseopts -E -a sopts S: r:=ropt R: q
+  sopts+=( $ropt:q )
   _alternative \
-    'heads::__git_heads' \
-    'commit-tags::__git_commit_tags' \
-    'commit-objects::__git_commit_objects'
+    "heads::__git_heads $sopts" \
+    "commit-tags::__git_commit_tags $sopts" \
+    "commit-objects::__git_commit_objects"
 }
 
 (( $+functions[__git_heads] )) ||
@@ -5595,10 +5598,12 @@ __git_commits2 () {
 
 (( $+functions[__git_commit_ranges] )) ||
 __git_commit_ranges () {
+  local -a suf
   if compset -P '*..(.|)'; then
     __git_commits $*
   else
-    __git_commits $* -qS ..
+    compset -S '..*' || suf=( -qS .. -r '.@~ ^:' )
+    __git_commits $* $suf
   fi
 }