Skip to content

[pull] master from fish-shell:master#272

Merged
pull[bot] merged 3 commits into
CrazyForks:masterfrom
fish-shell:master
Jun 24, 2026
Merged

[pull] master from fish-shell:master#272
pull[bot] merged 3 commits into
CrazyForks:masterfrom
fish-shell:master

Conversation

@pull

@pull pull Bot commented Jun 24, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

krobelus added 3 commits June 24, 2026 08:49
Reverts that part of ab397e7546 (fix: filter invalid short option
completions, 2026-06-18).

While at it, clean up a comment and assertion from eae1683
(Completion: complete argument to last of a group of short options,
2019-09-10).
complete -C"somecmd -xyz" will not suggest any of the short options
that are already present.  This is old behavior from 149594f
(Initial revision, 2005-09-20) ("if( wcschr( arg, nextopt ) != 0 )").
It's questionable, since repeated options may be valid ("ssh -vvv"
etc.), and completions should generally err on the side of false
positives; but given that short options are usually easy to type,
and discovery is not really relevant if they are already on the
command line, this seems fine? Not sure.

Recently, fab397e (fix: filter invalid short option completions,
2026-06-18) made two changes:

1. "complete somecmd -s X -n false; complete -C'somecmd -X'" no longer
   prints completions. This is a bug fix that reduces confusion.
2. complete -C"somecmd -YY" where "Y" no longer completes other short
   options because we treat repetition as error. But it's not
   necessarily, and hiding unrelated completions seems wrong.

Revert change 2.

See #12821 (comment)
@pull pull Bot locked and limited conversation to collaborators Jun 24, 2026
@pull pull Bot added the ⤵️ pull label Jun 24, 2026
@pull pull Bot merged commit be58b66 into CrazyForks:master Jun 24, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant