Re: [PATCH 1/5] completion: simplify stash subcommand completion

From: Ben Knoble <ben.knoble@gmail.com>
Date: Oct 19, 2026, 19:58 UTC
Message-ID: <2076548D-473E-4EC7-AE92-3DCBF1D3A4F1@gmail.com>
In-Reply-To: <atHZzrybhYzMVGbQ@pks.im>

Show 9 quoted lines

> Le 16 oct. 2026 à 04:01, Patrick Steinhardt <ps@pks.im> a écrit :
> 
> On Mon, Oct 12, 2026 at 01:48:27PM -0400, D. Ben Knoble wrote:
>> The stash completion helper contains a hard-coded list of commands, but
>> git-stash provides a mechanism to list such commands
>> (--git-completion-helper). The pattern for using it is wrapped by
>> __git_resolve_builtins, so use it, bring _git_stash closer in line with
> 
> s/bring/bringing/?

Will fix!

Show 20 quoted lines

>> other completion helpers.
>> 
>> Note that we maintain the "save" special case, since it was removed from
>> default completion in 0eb5a4f911 (completion: stop showing 'save' for
>> stash by default, 2018-04-20). We don't have to do anything special with
>> the exclude (3rd) argument to __git_resolve_builtins, though, because
>> save is already marked PARSE_OPT_NOCOMPLETE.
> 
> I didn't understand the last sentence without going into the code.
> 
> I assume what you want to say is that we don't have to explicitly
> exclude it when completing the subcommand because it's already marked as
> NOCOMPLETE. But we don't want to fully ignore it, either, because we
> want to be able to complete that subcommand if the user explicitly wrote
> it?
> 
> So basically: we're not completing it if the user writes "git stash
> sa<TAB>", but we then know to complete its options if the user writes
> "git stash save --<TAB>". Which I guess makes sense for a deprecated
> subcommand.

Correct. I got a little too familiar with the completion guts while working on this. I’ll try reworking it when I get back to v2.

Show 18 quoted lines

>> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
>> index c3a49e2e22..d60e85479c 100644
>> --- a/contrib/completion/git-completion.bash
>> +++ b/contrib/completion/git-completion.bash
>> @@ -3553,8 +3553,12 @@ _git_sparse_checkout ()
>> 
>> _git_stash ()
>> {
>> -    local subcommands='push list show apply clear drop pop create branch import export'
>> -    local subcommand="$(__git_find_on_cmdline "$subcommands save")"
>> +    local subcommands subcommand
>> +
>> +    __git_resolve_builtins stash
>> +
>> +    subcommands="$___git_resolved_builtins"
>> +    subcommand="$(__git_find_on_cmdline "$subcommands save")"
> 
> More plumbing, but less stuff that we need to keep up-to-date.

And more aligned with other helpers, yep.

> This also
> fixes that the "store" subcommand wasn't completed, which should
> probably be pointed out in the commit message.

I missed that, will add. Thanks!