summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2019-11-11 21:25:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-12 04:45:47 (GMT)
commitc1ce9c06d0a0e8ad473bdbe800e8e089b8314e24 (patch)
tree043d06900f8a5af63080e46e2dc9bd098d19de99 /contrib
parentaeeb978ba6c757dddc1097fc4de96c0bc1c1e338 (diff)
downloadgit-c1ce9c06d0a0e8ad473bdbe800e8e089b8314e24.zip
git-c1ce9c06d0a0e8ad473bdbe800e8e089b8314e24.tar.gz
git-c1ce9c06d0a0e8ad473bdbe800e8e089b8314e24.tar.bz2
completion: learn to complete `git rebase --onto=`
In 2b9bd488ae ("completion: teach rebase to use __gitcomp_builtin", 2019-09-12), the completion script learned to complete rebase using __gitcomp_builtin(). However, this resulted in `--onto=` being suggested instead of `--onto `. Before, when there was a space, we'd start a new word and, as a result, fallback to __git_complete_refs() and `--onto` would be completed this way. However, now we match the `--*` case which does not know how to offer completions for refs. Teach _git_rebase() to complete refs in the `--onto=` case so that we fix this regression. Reported-by: Paul Jolly <paul@myitcv.io> Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash4
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 7b1ab46..2b64405 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2021,6 +2021,10 @@ _git_rebase ()
__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
return
;;
+ --onto=*)
+ __git_complete_refs --cur="${cur##--onto=}"
+ return
+ ;;
--*)
__gitcomp_builtin rebase "" \
"$__git_rebase_interactive_inprogress_options"