On Thu, Oct 11, 2018 at 9:38 PM Daniels Umanovskis
<daniels@xxxxxxxxxxxxx> wrote:
>
> Also remove git-cherry from Bash completion because plumbing
> commands do not belong there.
Er.. why?
>
> Signed-off-by: Daniels Umanovskis <daniels@xxxxxxxxxxxxx>
> ---
>
> Up to discussion whether cherry should be considered plumbing.
> I lean towards considering it a rarely-used porcelain command, but
> a case could be made either way so let's see what the list thinks.
>
> command-list.txt | 2 +-
> contrib/completion/git-completion.bash | 11 -----------
> 2 files changed, 1 insertion(+), 12 deletions(-)
>
> diff --git a/command-list.txt b/command-list.txt
> index c36ea3c18..bdca6e3d3 100644
> --- a/command-list.txt
> +++ b/command-list.txt
> @@ -62,7 +62,7 @@ git-check-mailmap purehelpers
> git-checkout mainporcelain history
> git-checkout-index plumbingmanipulators
> git-check-ref-format purehelpers
> -git-cherry ancillaryinterrogators complete
> +git-cherry plumbinginterrogators complete
> git-cherry-pick mainporcelain
> git-citool mainporcelain
> git-clean mainporcelain
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index d63d2dffd..12f7ce0c5 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -1340,17 +1340,6 @@ _git_checkout ()
> esac
> }
>
> -_git_cherry ()
> -{
> - case "$cur" in
> - --*)
> - __gitcomp_builtin cherry
> - return
> - esac
> -
> - __git_complete_refs
I think this is a regression. Because now "git cherry <tab>" will not
complete refs (the default completer can still complete "git cherry
--<tab>" fine). We support option completion of all commands no matter
what categeory they are. The category is mostly to hide them from "git
<tab>".
If you just want to hide "git cherry" from the "git <tab>" list, then
you could remove the "complete" tag in command-list.txt above.
> -}
> -
> __git_cherry_pick_inprogress_options="--continue --quit --abort"
>
> _git_cherry_pick ()
> --
> 2.19.1.330.g93276587c.dirty
>
--
Duy
