Only use nosort in bash <4.4
#1683
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dandavison
reviewed
May 4, 2024
etc/completion/completion.bash
Outdated
| if [[ ${BASH_VERSINFO[0]} -lt 4 || ( ${BASH_VERSINFO[0]} -eq 4 && ${BASH_VERSINFO[1]} -lt 4 ) ]]; then | ||
| complete -F _delta -o bashdefault -o default delta | ||
| else | ||
| complete -F _delta -o bashdefault -o default delta -o nosort |
There was a problem hiding this comment.
Curious why you moved -o nosort after delta. I'm not saying it's incorrect but I think positional arguments (delta) typically go last.
There was a problem hiding this comment.
Whoops, my bad. I reordered them so the difference between the two lines was clearer, but it looks like I didn't realize delta was positional. Fixing it now.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Today I updated
git-deltaviabrewand started seeing the following error message in all my new shells:Turns out the
bash_completion.dscript included in delta usesnosort, which doesn't exist until Bash 4.4, which I don't have (native macOS bash is currently 3.2.57 for me).So I added a check for the version,
blatantly stolenheavily inspired from what cobra does.