diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-06 09:50:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-06 09:50:20 +0300 |
| commit | 9ffcf754dacea247c15dd78a61f0eebb4493bc75 (patch) | |
| tree | 2ea46e063929bd3ac54c71dd5763e9351123ca56 /contrib | |
| parent | 3df27e0e34a634efd0aa842bc49030393deed673 (diff) | |
| parent | 276b49ff3413434ec491db8fcb56485a71c6b6e7 (diff) | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 86b8f474c8..e9647a103a 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 |