Skip to content
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

git-blame-ignore-revs: add a file to ignore certain git revisions #162430

Merged
merged 1 commit into from
Mar 2, 2022

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Mar 2, 2022

to be able to set the ignoreRevsFile globally we will need the patch in
this email thread https://lore.kernel.org/git/20190107213013.231514-1-brho@google.com/

Motivation for this change

better blaming with gitsigns
and for the future treewide nix file reformatting

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

to be able to set the ignoreRevsFile globally we will need the patch in
this email thread https://lore.kernel.org/git/20190107213013.231514-1-brho@google.com/
@happysalada
Copy link
Contributor

This looks good to me

@teto
Copy link
Member

teto commented Mar 2, 2022

sry I didn't read the whole thread but is that feature going to be in mainline git or was the patch rejected already ?

Copy link
Member

@0x4A6F 0x4A6F left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@sternenseemann
Copy link
Member

sry I didn't read the whole thread but is that feature going to be in mainline git or was the patch rejected already ?

This feature has been supported by git for a while, only GitHub is lacking support for it.

@0x4A6F 0x4A6F merged commit 863e863 into NixOS:master Mar 2, 2022
@Artturin Artturin deleted the gitblameignorerevadd branch March 2, 2022 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants