Scott Chacon
@scottchacon.com
CEO of @gitbutler.com, previously cofounder of @github.com. All opinions are my own, but also objectively the best.
This is so strange, for some reason I thought rebase preserved them. `git replay` does, which is probably why GitHub works, so it can do these in memory. I believe libgit2 does as well, so maybe they're still using that. @gitlab.com and @gitea.com don't, so they're prob shelling out to `git rebase`
March 30, 2025 at 5:40 PM
This is so strange, for some reason I thought rebase preserved them. `git replay` does, which is probably why GitHub works, so it can do these in memory. I believe libgit2 does as well, so maybe they're still using that. @gitlab.com and @gitea.com don't, so they're prob shelling out to `git rebase`
He’s right, your rebase also strips extra headers. Do you know where the whitelist of headers is hard coded?
March 27, 2025 at 5:44 PM
He’s right, your rebase also strips extra headers. Do you know where the whitelist of headers is hard coded?
We actually have a third structure, which is virtual branches - you can work on multiple branches (or stacks of branches) at the same time in one working directory. In case multiple stacks or branches have no interdependencies.
March 25, 2025 at 1:08 PM
We actually have a third structure, which is virtual branches - you can work on multiple branches (or stacks of branches) at the same time in one working directory. In case multiple stacks or branches have no interdependencies.
I like the two levels.
Per-commit review within a branch means they are all merged together. Stacking branches means the bottom should be merged first, but stacks above it depend on those but don’t need to be merged at the same time.
Its a useful mental difference when working on them.
Per-commit review within a branch means they are all merged together. Stacking branches means the bottom should be merged first, but stacks above it depend on those but don’t need to be merged at the same time.
Its a useful mental difference when working on them.
March 25, 2025 at 1:06 PM
I like the two levels.
Per-commit review within a branch means they are all merged together. Stacking branches means the bottom should be merged first, but stacks above it depend on those but don’t need to be merged at the same time.
Its a useful mental difference when working on them.
Per-commit review within a branch means they are all merged together. Stacking branches means the bottom should be merged first, but stacks above it depend on those but don’t need to be merged at the same time.
Its a useful mental difference when working on them.
Really? That seems like an unlikely reason. The signature just verifies the commit data minus the signature, it shouldn't matter what is in there for a verification. Can you point me at a use case?
In fact, if this were true, Gitea would break with any new future official git headers.
In fact, if this were true, Gitea would break with any new future official git headers.
March 24, 2025 at 9:02 PM
Really? That seems like an unlikely reason. The signature just verifies the commit data minus the signature, it shouldn't matter what is in there for a verification. Can you point me at a use case?
In fact, if this were true, Gitea would break with any new future official git headers.
In fact, if this were true, Gitea would break with any new future official git headers.
Currently no, but it's on our short list.
March 21, 2025 at 11:03 AM
Currently no, but it's on our short list.
Not the entire history, just the commits you are trying to review.
March 21, 2025 at 6:51 AM
Not the entire history, just the commits you are trying to review.
my god, the russian bear octocat. probably my favorite one.
March 17, 2025 at 12:50 PM
my god, the russian bear octocat. probably my favorite one.
I think they come up a few days later or something.
March 4, 2025 at 8:55 PM
I think they come up a few days later or something.
Dont worry, my next post is about bundle-uri, which I think is more Derrick.
March 1, 2025 at 3:45 PM
Dont worry, my next post is about bundle-uri, which I think is more Derrick.
In fact, I thought I _just_ saw in the GerritForge summit video that branch based review was _maybe_ on the horizon
February 28, 2025 at 8:53 PM
In fact, I thought I _just_ saw in the GerritForge summit video that branch based review was _maybe_ on the horizon
I’m curious. You say “series” but my last run in with Gerrit was that it was very single commit based. Even looking at the docs now, it still appears single patch based. Can you do a series of commits as a change basis now?
February 28, 2025 at 8:52 PM
I’m curious. You say “series” but my last run in with Gerrit was that it was very single commit based. Even looking at the docs now, it still appears single patch based. Can you do a series of commits as a change basis now?
This is how shit gets done.
February 7, 2025 at 11:27 AM
This is how shit gets done.