News for hackers. Stuff that matters.
Re:Julia Evans: Git rebase, what can go wrong by FeepingCreature on Monday November 06, 2023 @01:05PM (#38166203)
> What matters is that you end up with working systems. That a lot of change happened is just, well, what happened. It doesn't need to be prettied up and made to look like your development occurred in a clockwork march of cleanliness. It literally does not matter unless you spend a lot of time doing git-bisect.

And git blame. And git checkout to a past state. It "doesn't matter" only if ease of understanding your project history doesn't matter.

Re:Julia Evans: Git rebase, what can go wrong by jjeaff on Monday November 06, 2023 @01:24PM (#38166536)
how often is "understanding your project history" something that actually comes up for you? In all my years of working with projects in git, I will occasionally look at my history to help me find a change that may have led to a bug, but it really only comes up for me once or twice a year and even then, it is rarely an extensive deep dive and never very far back in time.
Re:Julia Evans: Git rebase, what can go wrong by duped on Monday November 06, 2023 @01:35PM (#38166716)
Do you work with other people or on large codebases at all? It comes up pretty much weekly for me.
Re:Julia Evans: Git rebase, what can go wrong by nomel on Monday November 06, 2023 @01:59PM (#38167093)
> I will occasionally look at my history

It's others history that I'm usually interested in. I can easy follow the small diffs of individual commits, but have a much harder time grokking a wall of red and green.

Re:Julia Evans: Git rebase, what can go wrong by tomjakubowski on Monday November 06, 2023 @02:03PM (#38167164)
I read git commits in either the repo I am working on or a dependency repo almost every day
Re:Julia Evans: Git rebase, what can go wrong by erik_seaberg on Monday November 06, 2023 @03:01PM (#38168084)
When I’m on call and discover at 3 AM that we’re doing something weird, I need to know whether we meant to do that and especially why. In theory you could write all that down, but the people who aren’t doing that in git also won’t do it outside of git. The more you write down, the less likely it is that I need to page you to ask WTF.
Re:Julia Evans: Git rebase, what can go wrong by suzzer99 on Monday November 06, 2023 @03:04PM (#38168140)
Same, and I've worked on some large, long-running projects. But never at the scale of a big tech company.

I've used git bisect the few times I've had to diagnose an issue that wasn't detected immediately, which gets you down to the exact granular commit.

Re:Julia Evans: Git rebase, what can go wrong by Groxx on Monday November 06, 2023 @03:25PM (#38168460)
>how often is "understanding your project history" something that actually comes up for you?

Frequently, for any long and complex project. Large amounts were written by people no longer working on it, and the history of how things came to be can help fill in documentation gaps and make intent clear.

By "frequently" I mean something like "I check history for about 2/3rds of bug fixes, and 1/4 of adding features" to understand the surroundings better, when writing or reviewing. Anything that makes that better saves me hours per week.

It catches and prevents more than enough subtle issues to be worth the effort.

Re:Julia Evans: Git rebase, what can go wrong by mixmastamyk on Monday November 06, 2023 @06:21PM (#38170672)
I'm on a long and complex project. However most of previous folks were not very good and one reason I'm here to fix it. Their history is not particularly useful except to giggle at.
Re:Julia Evans: Git rebase, what can go wrong by pjc50 on Monday November 06, 2023 @03:41PM (#38168673)
Sometimes. Once every few months. Sometimes it conveys useful information. Sometimes it just hits the "product imported from previous VCS a decade ago" commit.
Re:Julia Evans: Git rebase, what can go wrong by icedchai on Monday November 06, 2023 @06:26PM (#38170724)
It comes up often enough. I run "git blames" frequently to figure why something odd looking was introduced. It may not be a bug, but a WTF. This is in an environment with few code reviews, despite my attempts to introduce them. It is frustrating.
Re:Julia Evans: Git rebase, what can go wrong by mmazing on Monday November 06, 2023 @01:31PM (#38166659)
I never use rebase, and I've never once had trouble understanding who did what where and when, even in a large project with 500+ users.

That being said, after reading this stuff, I may start using it on my local branches to clean up multiple commits into one tidy one, but that's about it.

Re:Julia Evans: Git rebase, what can go wrong by Hackbraten on Monday November 06, 2023 @07:53PM (#38171602)
> I never use rebase, and I've never once had trouble understanding who did what where and when

And a well-organized commit can also tell you the “why.”

Re:Julia Evans: Git rebase, what can go wrong by Nullabillity on Monday November 06, 2023 @04:36PM (#38169374)
Every time I try to blame or bisect and just end up stuck on an irrelevant megacommit I curse the Git maintainers that don't have the backbone to just get rid of --squash.

Every time I try to review a PR and the bookmark resets because they decided to force push I curse the Git maintainers that don't have the backbone to just get rid of rebase.