Only use `nosort` in bash <4.4 by martinml · Pull Request #1683 · dandavison/delta

martinml · 2024-05-04T09:38:18Z

Today I updated git-delta via brew and started seeing the following error message in all my new shells:

-bash: complete: nosort: invalid option name

Turns out the bash_completion.d script included in delta uses nosort, 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 stolen~~ heavily inspired from what cobra does.

dandavison · 2024-05-04T14:04:53Z

+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


Curious why you moved -o nosort after delta. I'm not saying it's incorrect but I think positional arguments (delta) typically go last.

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.

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [dandavison/delta](https://github.com/dandavison/delta) | minor | `0.17.0` -> `0.18.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>dandavison/delta (dandavison/delta)</summary> ### [`v0.18.0`](https://github.com/dandavison/delta/releases/tag/0.18.0) [Compare Source](dandavison/delta@0.17.0...0.18.0) As usual, tons of excellent contributions, all but one not by me! [@th1000s](https://github.com/th1000s) has made a huge number of important and difficult improvements to delta and helped with many issues over the few years since the project started, and so I'm happy to say that he's co-maintaining the project with me nowadays. Thanks to all contributors for the improvements below! #### What's Changed - Link to Repository from Manual by [@bash](https://github.com/bash) in dandavison/delta#1657 - Stop highlighting unchanged whitespace by [@phillipwood](https://github.com/phillipwood) in dandavison/delta#1659 - Add .gitattributes rules for rust files by [@phillipwood](https://github.com/phillipwood) in dandavison/delta#1245 - Repair --default-language, and highlight using full filename by [@th1000s](https://github.com/th1000s) in dandavison/delta#1549 - tests: prevent parallel env var access by [@th1000s](https://github.com/th1000s) in dandavison/delta#1681 - CI: fix macOS build by [@th1000s](https://github.com/th1000s) in dandavison/delta#1696 - Only use `nosort` in bash <4.4 by [@martinml](https://github.com/martinml) in dandavison/delta#1683 - Don't read git files when --no-gitconfig is given + unused variables by [@th1000s](https://github.com/th1000s) in dandavison/delta#1728 - tests: add insta for snapshot testing by [@th1000s](https://github.com/th1000s) in dandavison/delta#1739 - tests: set terminal width to 43 by [@th1000s](https://github.com/th1000s) in dandavison/delta#1741 - Fix panic when blame-palette is empty by [@thorio](https://github.com/thorio) in dandavison/delta#1737 - Make relative-paths work with binary files by [@th1000s](https://github.com/th1000s) in dandavison/delta#1740 - Fix github links from master to main by [@madeddie](https://github.com/madeddie) in dandavison/delta#1709 - Update `terminal-colorsaurus` by [@bash](https://github.com/bash) in dandavison/delta#1699 - Make less version >= 633 behave like previous versions wrt. Nerd Fonts by [@th1000s](https://github.com/th1000s) in dandavison/delta#1762 - Update `catppuccin-latte` casing in `LIGHT_SYNTAX_THEMES` list by [@injust](https://github.com/injust) in dandavison/delta#1745 - deps: bump libc from 0.2.153 to 0.2.155 by [@wxpppp](https://github.com/wxpppp) in dandavison/delta#1715 - Add missing `--file-*-label` option to `--navigate` docs by [@injust](https://github.com/injust) in dandavison/delta#1744 - Fix copy-paste typo by [@injust](https://github.com/injust) in dandavison/delta#1767 - Update syntect to 5.2.0 by [@timhillgit](https://github.com/timhillgit) in dandavison/delta#1672 - Disable light mode detection in tests by [@bash](https://github.com/bash) in dandavison/delta#1765 - Add --max-syntax-highlighting-length, set to 400 by [@th1000s](https://github.com/th1000s) in dandavison/delta#1746 - chore: cleanup brew formula file in favor of core tap by [@chenrui333](https://github.com/chenrui333) in dandavison/delta#1773 - wrap --help output, fix rust 1.80 build by [@th1000s](https://github.com/th1000s) in dandavison/delta#1440 - Fix delta-toggle shell script by [@dandavison](https://github.com/dandavison) in dandavison/delta#1794 - Do not wrap short help (-h) output by [@th1000s](https://github.com/th1000s) in dandavison/delta#1800 - Implement --diff-args by [@dandavison](https://github.com/dandavison) in dandavison/delta#1697 - Handle ambiguous diff header, '--- ' can also be present in a minus hunk by [@th1000s](https://github.com/th1000s) in dandavison/delta#1787 - cd: build binaries targeting GNU libc on ubuntu-20.04, not latest by [@th1000s](https://github.com/th1000s) in dandavison/delta#1805 #### New Contributors - [@martinml](https://github.com/martinml) made their first contribution in dandavison/delta#1683 - [@thorio](https://github.com/thorio) made their first contribution in dandavison/delta#1737 - [@madeddie](https://github.com/madeddie) made their first contribution in dandavison/delta#1709 - [@injust](https://github.com/injust) made their first contribution in dandavison/delta#1745 - [@wxpppp](https://github.com/wxpppp) made their first contribution in dandavison/delta#1715 - [@timhillgit](https://github.com/timhillgit) made their first contribution in dandavison/delta#1672 - [@chenrui333](https://github.com/chenrui333) made their first contribution in dandavison/delta#1773 **Full Changelog**: dandavison/delta@0.17.0...0.18.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

Only use nosort in bash <4.4

a2a735c

dandavison reviewed May 4, 2024

View reviewed changes

Fix bad parameter order

1c5af17

dandavison merged commit 0f8a2f0 into dandavison:main May 10, 2024

BrewTestBot mentioned this pull request Aug 16, 2024

git-delta 0.18.0 Homebrew/homebrew-core#181387

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Only use `nosort` in bash <4.4#1683

Only use `nosort` in bash <4.4#1683
dandavison merged 2 commits into
dandavison:mainfrom
martinml:patch-1

martinml commented May 4, 2024

Uh oh!

dandavison May 4, 2024

Uh oh!

martinml May 8, 2024 •

edited

Loading

Uh oh!

dandavison May 8, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

martinml commented May 4, 2024

Uh oh!

dandavison May 4, 2024

Choose a reason for hiding this comment

Uh oh!

martinml May 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dandavison May 8, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

martinml May 8, 2024 •

edited

Loading