News for hackers. Stuff that matters.

A comment on Fortunately, I don't squash my commits. Parent comment

Re:Fortunately, I don't squash my commits by maccard on Monday October 05, 2020 @07:59AM (#24686859)
We go through ~600 commits per day. In my experience, there's nothing worse than looking for when a value was changed from 10 to 100, and finding it in a "Merged from X" commit with the history of why the value was changed from 10 to 100.

I don't often (ever?) browse the history, but I _do_ regularly search the history using tooling, (git log | grep <something>), and more is more in that case, even if the history isn't perfect.

[ Parent | on HN ]
Re:Fortunately, I don't squash my commits by saagarjha on Monday October 05, 2020 @11:47AM (#24688792)
That just sounds like a bad squash.
[ Parent | on HN ]
Re:Fortunately, I don't squash my commits by maccard on Monday October 05, 2020 @01:29PM (#24689884)
If the original commits are: - Change X to 10 by Foo - Change X to 100 by Bar - Change X to 50 by Baz

And that gets squashed into `Change X to 50 by Baz`, you lose the context as to why Foo and Bar changed it, and the values. If I need to go investigate an issue with X, I'd rather thave the history of all the changes.

[ Parent | on HN ]
Re:Fortunately, I don't squash my commits by saagarjha on Monday October 05, 2020 @11:07PM (#24694396)
Commits by multiple people should rarely, if ever, be squashed.
[ Parent | on HN ]