Nguyễn Thái Ngọc Duy 276b49ff34 completion: fix __gitcomp_builtin no longer consider extra options ... __gitcomp_builtin() has the main completion list provided by git xxx --git-completion-helper but the caller can also add extra options that is not provided by --git-completion-helper. The only call site that does this is "git difftool" completion. This support is broken by b221b5ab9b (completion: collapse extra --no-.. options - 2018-06-06), which adds a special value "--" to mark that the rest of the options can be hidden by default. The commit forgets the fact that extra options are appended after "$(git xxx --git-completion-helper)", i.e. after this "--", and will be incorrectly hidden as well. Prepend the extra options before "$(git xxx --git-completion-helper)" to avoid this. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2018-10-22 12:52:29 +09:00
..
.gitattributes	completion: mark bash script as LF-only	2017-05-10 13:32:51 +09:00
git-completion.bash	completion: fix __gitcomp_builtin no longer consider extra options	2018-10-22 12:52:29 +09:00
git-completion.tcsh	git-completion.tcsh: fix redirect with noclobber	2015-06-09 11:21:15 -07:00
git-completion.zsh	completion: fill COMPREPLY directly when completing refs	2017-03-23 11:18:22 -07:00
git-prompt.sh	git-prompt: fix reading files with windows line endings	2017-12-06 10:08:13 -08:00