-
Notifications
You must be signed in to change notification settings - Fork 398
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add .gitattributes rules for rust files #1245
Add .gitattributes rules for rust files #1245
Conversation
3e710ed
to
9b33424
Compare
Thanks! I haven't spent much time with this, but |
Oh dear, I'd forgotten that it could do that (there was a discussion about fixing this on the git mailing list a while ago but nothing came of it). On the whole I think it is an improvement as it generally shows the function being changed rather than the enclosing struct or mod (see below, before on the left, after on the right) but if you're not keen then lets drop |
While delta currently removes git's whitespace error markup from diffs adding the whitespace rules will mean pre-commit hooks that run `git diff --check` will reject changes with whitespace errors. In order to get git to print the correct position of the error when there is an unwanted tab in the indent following a space it is necessary to turn off `space-before-tab` otherwise the space will be considered to be an error instead of the tab. The whitespace rule could perhaps be applied more widely but the Makefile and example gitcofig have leading tabs so it is restricted them to just rust files for now.
9b33424
to
ff96130
Compare
I've removed the diff attribute leaving just the whitespace attributes sorry it has taken me so long to get around to it. |
Thanks! |
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. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [dandavison/delta](https://togithub.com/dandavison/delta) | minor | `0.17.0` -> `0.18.0` | --- ### Release Notes <details> <summary>dandavison/delta (dandavison/delta)</summary> ### [`v0.18.0`](https://togithub.com/dandavison/delta/releases/tag/0.18.0) [Compare Source](https://togithub.com/dandavison/delta/compare/0.17.0...0.18.0) As usual, tons of excellent contributions, all but one not by me! [@​th1000s](https://togithub.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://togithub.com/bash) in [https://github.com/dandavison/delta/pull/1657](https://togithub.com/dandavison/delta/pull/1657) - Stop highlighting unchanged whitespace by [@​phillipwood](https://togithub.com/phillipwood) in [https://github.com/dandavison/delta/pull/1659](https://togithub.com/dandavison/delta/pull/1659) - Add .gitattributes rules for rust files by [@​phillipwood](https://togithub.com/phillipwood) in [https://github.com/dandavison/delta/pull/1245](https://togithub.com/dandavison/delta/pull/1245) - Repair --default-language, and highlight using full filename by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1549](https://togithub.com/dandavison/delta/pull/1549) - tests: prevent parallel env var access by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1681](https://togithub.com/dandavison/delta/pull/1681) - CI: fix macOS build by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1696](https://togithub.com/dandavison/delta/pull/1696) - Only use `nosort` in bash <4.4 by [@​martinml](https://togithub.com/martinml) in [https://github.com/dandavison/delta/pull/1683](https://togithub.com/dandavison/delta/pull/1683) - Don't read git files when --no-gitconfig is given + unused variables by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1728](https://togithub.com/dandavison/delta/pull/1728) - tests: add insta for snapshot testing by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1739](https://togithub.com/dandavison/delta/pull/1739) - tests: set terminal width to 43 by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1741](https://togithub.com/dandavison/delta/pull/1741) - Fix panic when blame-palette is empty by [@​thorio](https://togithub.com/thorio) in [https://github.com/dandavison/delta/pull/1737](https://togithub.com/dandavison/delta/pull/1737) - Make relative-paths work with binary files by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1740](https://togithub.com/dandavison/delta/pull/1740) - Fix github links from master to main by [@​madeddie](https://togithub.com/madeddie) in [https://github.com/dandavison/delta/pull/1709](https://togithub.com/dandavison/delta/pull/1709) - Update `terminal-colorsaurus` by [@​bash](https://togithub.com/bash) in [https://github.com/dandavison/delta/pull/1699](https://togithub.com/dandavison/delta/pull/1699) - Make less version >= 633 behave like previous versions wrt. Nerd Fonts by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1762](https://togithub.com/dandavison/delta/pull/1762) - Update `catppuccin-latte` casing in `LIGHT_SYNTAX_THEMES` list by [@​injust](https://togithub.com/injust) in [https://github.com/dandavison/delta/pull/1745](https://togithub.com/dandavison/delta/pull/1745) - deps: bump libc from 0.2.153 to 0.2.155 by [@​wxpppp](https://togithub.com/wxpppp) in [https://github.com/dandavison/delta/pull/1715](https://togithub.com/dandavison/delta/pull/1715) - Add missing `--file-*-label` option to `--navigate` docs by [@​injust](https://togithub.com/injust) in [https://github.com/dandavison/delta/pull/1744](https://togithub.com/dandavison/delta/pull/1744) - Fix copy-paste typo by [@​injust](https://togithub.com/injust) in [https://github.com/dandavison/delta/pull/1767](https://togithub.com/dandavison/delta/pull/1767) - Update syntect to 5.2.0 by [@​timhillgit](https://togithub.com/timhillgit) in [https://github.com/dandavison/delta/pull/1672](https://togithub.com/dandavison/delta/pull/1672) - Disable light mode detection in tests by [@​bash](https://togithub.com/bash) in [https://github.com/dandavison/delta/pull/1765](https://togithub.com/dandavison/delta/pull/1765) - Add --max-syntax-highlighting-length, set to 400 by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1746](https://togithub.com/dandavison/delta/pull/1746) - chore: cleanup brew formula file in favor of core tap by [@​chenrui333](https://togithub.com/chenrui333) in [https://github.com/dandavison/delta/pull/1773](https://togithub.com/dandavison/delta/pull/1773) - wrap --help output, fix rust 1.80 build by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1440](https://togithub.com/dandavison/delta/pull/1440) - Fix delta-toggle shell script by [@​dandavison](https://togithub.com/dandavison) in [https://github.com/dandavison/delta/pull/1794](https://togithub.com/dandavison/delta/pull/1794) - Do not wrap short help (-h) output by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1800](https://togithub.com/dandavison/delta/pull/1800) - Implement --diff-args by [@​dandavison](https://togithub.com/dandavison) in [https://github.com/dandavison/delta/pull/1697](https://togithub.com/dandavison/delta/pull/1697) - Handle ambiguous diff header, '--- ' can also be present in a minus hunk by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1787](https://togithub.com/dandavison/delta/pull/1787) - cd: build binaries targeting GNU libc on ubuntu-20.04, not latest by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1805](https://togithub.com/dandavison/delta/pull/1805) #### New Contributors - [@​martinml](https://togithub.com/martinml) made their first contribution in [https://github.com/dandavison/delta/pull/1683](https://togithub.com/dandavison/delta/pull/1683) - [@​thorio](https://togithub.com/thorio) made their first contribution in [https://github.com/dandavison/delta/pull/1737](https://togithub.com/dandavison/delta/pull/1737) - [@​madeddie](https://togithub.com/madeddie) made their first contribution in [https://github.com/dandavison/delta/pull/1709](https://togithub.com/dandavison/delta/pull/1709) - [@​injust](https://togithub.com/injust) made their first contribution in [https://github.com/dandavison/delta/pull/1745](https://togithub.com/dandavison/delta/pull/1745) - [@​wxpppp](https://togithub.com/wxpppp) made their first contribution in [https://github.com/dandavison/delta/pull/1715](https://togithub.com/dandavison/delta/pull/1715) - [@​timhillgit](https://togithub.com/timhillgit) made their first contribution in [https://github.com/dandavison/delta/pull/1672](https://togithub.com/dandavison/delta/pull/1672) - [@​chenrui333](https://togithub.com/chenrui333) made their first contribution in [https://github.com/dandavison/delta/pull/1773](https://togithub.com/dandavison/delta/pull/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**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/d-issy/dotfiles). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [dandavison/delta](https://togithub.com/dandavison/delta) | minor | `0.17.0` -> `0.18.0` | --- ### Release Notes <details> <summary>dandavison/delta (dandavison/delta)</summary> ### [`v0.18.0`](https://togithub.com/dandavison/delta/releases/tag/0.18.0) [Compare Source](https://togithub.com/dandavison/delta/compare/0.17.0...0.18.0) As usual, tons of excellent contributions, all but one not by me! [@​th1000s](https://togithub.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://togithub.com/bash) in [https://github.com/dandavison/delta/pull/1657](https://togithub.com/dandavison/delta/pull/1657) - Stop highlighting unchanged whitespace by [@​phillipwood](https://togithub.com/phillipwood) in [https://github.com/dandavison/delta/pull/1659](https://togithub.com/dandavison/delta/pull/1659) - Add .gitattributes rules for rust files by [@​phillipwood](https://togithub.com/phillipwood) in [https://github.com/dandavison/delta/pull/1245](https://togithub.com/dandavison/delta/pull/1245) - Repair --default-language, and highlight using full filename by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1549](https://togithub.com/dandavison/delta/pull/1549) - tests: prevent parallel env var access by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1681](https://togithub.com/dandavison/delta/pull/1681) - CI: fix macOS build by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1696](https://togithub.com/dandavison/delta/pull/1696) - Only use `nosort` in bash <4.4 by [@​martinml](https://togithub.com/martinml) in [https://github.com/dandavison/delta/pull/1683](https://togithub.com/dandavison/delta/pull/1683) - Don't read git files when --no-gitconfig is given + unused variables by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1728](https://togithub.com/dandavison/delta/pull/1728) - tests: add insta for snapshot testing by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1739](https://togithub.com/dandavison/delta/pull/1739) - tests: set terminal width to 43 by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1741](https://togithub.com/dandavison/delta/pull/1741) - Fix panic when blame-palette is empty by [@​thorio](https://togithub.com/thorio) in [https://github.com/dandavison/delta/pull/1737](https://togithub.com/dandavison/delta/pull/1737) - Make relative-paths work with binary files by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1740](https://togithub.com/dandavison/delta/pull/1740) - Fix github links from master to main by [@​madeddie](https://togithub.com/madeddie) in [https://github.com/dandavison/delta/pull/1709](https://togithub.com/dandavison/delta/pull/1709) - Update `terminal-colorsaurus` by [@​bash](https://togithub.com/bash) in [https://github.com/dandavison/delta/pull/1699](https://togithub.com/dandavison/delta/pull/1699) - Make less version >= 633 behave like previous versions wrt. Nerd Fonts by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1762](https://togithub.com/dandavison/delta/pull/1762) - Update `catppuccin-latte` casing in `LIGHT_SYNTAX_THEMES` list by [@​injust](https://togithub.com/injust) in [https://github.com/dandavison/delta/pull/1745](https://togithub.com/dandavison/delta/pull/1745) - deps: bump libc from 0.2.153 to 0.2.155 by [@​wxpppp](https://togithub.com/wxpppp) in [https://github.com/dandavison/delta/pull/1715](https://togithub.com/dandavison/delta/pull/1715) - Add missing `--file-*-label` option to `--navigate` docs by [@​injust](https://togithub.com/injust) in [https://github.com/dandavison/delta/pull/1744](https://togithub.com/dandavison/delta/pull/1744) - Fix copy-paste typo by [@​injust](https://togithub.com/injust) in [https://github.com/dandavison/delta/pull/1767](https://togithub.com/dandavison/delta/pull/1767) - Update syntect to 5.2.0 by [@​timhillgit](https://togithub.com/timhillgit) in [https://github.com/dandavison/delta/pull/1672](https://togithub.com/dandavison/delta/pull/1672) - Disable light mode detection in tests by [@​bash](https://togithub.com/bash) in [https://github.com/dandavison/delta/pull/1765](https://togithub.com/dandavison/delta/pull/1765) - Add --max-syntax-highlighting-length, set to 400 by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1746](https://togithub.com/dandavison/delta/pull/1746) - chore: cleanup brew formula file in favor of core tap by [@​chenrui333](https://togithub.com/chenrui333) in [https://github.com/dandavison/delta/pull/1773](https://togithub.com/dandavison/delta/pull/1773) - wrap --help output, fix rust 1.80 build by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1440](https://togithub.com/dandavison/delta/pull/1440) - Fix delta-toggle shell script by [@​dandavison](https://togithub.com/dandavison) in [https://github.com/dandavison/delta/pull/1794](https://togithub.com/dandavison/delta/pull/1794) - Do not wrap short help (-h) output by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1800](https://togithub.com/dandavison/delta/pull/1800) - Implement --diff-args by [@​dandavison](https://togithub.com/dandavison) in [https://github.com/dandavison/delta/pull/1697](https://togithub.com/dandavison/delta/pull/1697) - Handle ambiguous diff header, '--- ' can also be present in a minus hunk by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1787](https://togithub.com/dandavison/delta/pull/1787) - cd: build binaries targeting GNU libc on ubuntu-20.04, not latest by [@​th1000s](https://togithub.com/th1000s) in [https://github.com/dandavison/delta/pull/1805](https://togithub.com/dandavison/delta/pull/1805) #### New Contributors - [@​martinml](https://togithub.com/martinml) made their first contribution in [https://github.com/dandavison/delta/pull/1683](https://togithub.com/dandavison/delta/pull/1683) - [@​thorio](https://togithub.com/thorio) made their first contribution in [https://github.com/dandavison/delta/pull/1737](https://togithub.com/dandavison/delta/pull/1737) - [@​madeddie](https://togithub.com/madeddie) made their first contribution in [https://github.com/dandavison/delta/pull/1709](https://togithub.com/dandavison/delta/pull/1709) - [@​injust](https://togithub.com/injust) made their first contribution in [https://github.com/dandavison/delta/pull/1745](https://togithub.com/dandavison/delta/pull/1745) - [@​wxpppp](https://togithub.com/wxpppp) made their first contribution in [https://github.com/dandavison/delta/pull/1715](https://togithub.com/dandavison/delta/pull/1715) - [@​timhillgit](https://togithub.com/timhillgit) made their first contribution in [https://github.com/dandavison/delta/pull/1672](https://togithub.com/dandavison/delta/pull/1672) - [@​chenrui333](https://togithub.com/chenrui333) made their first contribution in [https://github.com/dandavison/delta/pull/1773](https://togithub.com/dandavison/delta/pull/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 PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/izumin5210/dotfiles). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4yNi4xIiwidXBkYXRlZEluVmVyIjoiMzguMjYuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: izumin5210-update-aqua-checksum[bot] <169593670+izumin5210-update-aqua-checksum[bot]@users.noreply.github.com>
Setting
diff=rust
will make git show the current function name in the hunk headers.While delta currently removes git's whitespace error markup from diffs adding the whitespace rules will mean pre-commit hooks that run
git diff --check
will reject changes with whitespace errors. In order to get git to print the correct position of the error when there is an unwanted tab in the indent following a space we need to turn offspace-before-tab
otherwise the space will be considered to be an error instead of the tab.The whitespace rule could perhaps be applied more widely but the Makefile and example gitcofig have leading tabs so I restricted them to rust files for now.
[edited to explain
-space-before-tab
]