Communities

Writing
Writing
Codidact Meta
Codidact Meta
The Great Outdoors
The Great Outdoors
Photography & Video
Photography & Video
Scientific Speculation
Scientific Speculation
Cooking
Cooking
Electrical Engineering
Electrical Engineering
Judaism
Judaism
Languages & Linguistics
Languages & Linguistics
Software Development
Software Development
Mathematics
Mathematics
Christianity
Christianity
Code Golf
Code Golf
Music
Music
Physics
Physics
Linux Systems
Linux Systems
Power Users
Power Users
Tabletop RPGs
Tabletop RPGs
Community Proposals
Community Proposals
tag:snake search within a tag
answers:0 unanswered questions
user:xxxx search by author id
score:0.5 posts with 0.5+ score
"snake oil" exact phrase
votes:4 posts with 4+ votes
created:<1w created < 1 week ago
post_type:xxxx type of post
Search help
Notifications
Mark all as read See all your notifications »
Q&A

Welcome to Software Development on Codidact!

Will you help us build our independent community of developers helping developers? We're small and trying to grow. We welcome questions about all aspects of software development, from design to code to QA and more. Got questions? Got answers? Got code you'd like someone to review? Please join us.

Comments on How to keep git blame ignored commits up to date?

Post

How to keep git blame ignored commits up to date?

+4
−0

When I make a separate commit for code cleanup / style changes, I can suppress that commit from git blame so that I can follow a file's history easily without getting distracted by pure style changes. I do that by putting the cleanup commit's hash in a file and tell git to ignore those commits for blaming purposes:

echo $the_full_hash >> .git-blame-ignore-revs 
git config blame.ignoreRevsFile .git-blame-ignore-revs

But at the time I make my cleanup commit, I don't have the hash yet, so I need an extra commit to update .git-blame-ignore-revs. I'd rather have that in the same commit.

Even if I can get the hash of my current working copy changes, adding that hash to .git-blame-ignore-revs would modify what I am committing, resulting in a different hash, as .git-blame-ignore-revs is also checked in.

On top of that, if I make 2 commits and then use github's PR squashing merge, my hash in .git-blame-ignore-revs is wrong as only the squashed commit makes it into git, not the individual ones.

How do people keep their .git-blame-ignore-revs up to date? Is there a better way than 2 commits?

History
Why does this post require attention from curators or moderators?
You might want to add some details to your flag.
Why should this post be closed?

1 comment thread

Not sure if it's a suitable solution, but anyway... (3 comments)
Not sure if it's a suitable solution, but anyway...
hkotsubo‭ wrote about 1 month ago · edited about 1 month ago

As you can't know the hash before commiting, I don't see a way to keep the ignore file updated within a single commit.

Instead of keeping this file, you could run something like this:

git blame $(for hash in $(git log --format="%H"); do echo "--ignore-rev" $hash; done) -- file

git log --format="%H" will provide the hashes, and you can change it to return only the ones you need - such as git log --grep="some text" --format="%H", assuming that all commits you want to ignore have some text in common, etc. If there's no such thing, you'll have to find another way to filter the commits.

Then the for loop takes all the hashes and passes them to git blame, in the form of --ignore-rev parameters (the docs says this option can be specified multiple times).

HeavyRain‭ wrote about 1 month ago

That is a crazy cool idea. Totally avoids the ignoreRevsFile file. Relies on convention of commit messages. I wonder if this would have performance impacts. Maybe I need a cron job to regenerate my ignoreRevsFile, or do that at each git pull and don't check it in. I need to think about this.

hkotsubo‭ wrote about 1 month ago

I don't see how this can have a significant impact on performance. Git is incredibly fast and a simple git log with some filters shouldn't take so long to run. Unless you're dealing with a really huge repository and runs git blame millions of times a day, which I don't think it's the case. Anyway, the best way to know is to make some tests and see how it goes.

Regarding the cron job idea, you could keep the ignoreRevs file in another location, outside of your project, so it doesn't interfere with the project's commits.