1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-14 13:56:18 +02:00

Merge branch 'nd/completion-negation'

The command line completion machinery (in contrib/) has been
updated to allow the completion script to tweak the list of options
that are reported by the parse-options machinery correctly.

* nd/completion-negation:
  completion: fix __gitcomp_builtin no longer consider extra options
This commit is contained in:
Junio C Hamano 2018-11-06 15:50:19 +09:00
commit 9ffcf754da

View File

@ -400,7 +400,7 @@ __gitcomp_builtin ()
if [ -z "$options" ]; then
# leading and trailing spaces are significant to make
# option removal work correctly.
options=" $(__git ${cmd/_/ } --git-completion-helper) $incl "
options=" $incl $(__git ${cmd/_/ } --git-completion-helper) "
for i in $excl; do
options="${options/ $i / }"
done