| 17 May 2024 |
Qyriad | you can have a relation chain! | 00:43:26 |
julia | oh those can be merged all at once? | 00:43:44 |
Qyriad | you can push a commit and that gets a change ID, and then push another commit on top which still gets reviewed separately, but can all be merged at once yep! | 00:44:00 |
Qyriad | this is one of the best things about gerrit. you can be working on these huuuuuge changes that are still reviewable because they're split up logically and you can review each commit as it comes, but then still keep working on the later parts without blocking the whole thing | 00:45:35 |
Qyriad | and then if it turns out that the later commits have some problems that will take more time, you can just merge the entire chain below and still have merged significant progress into the codebase | 00:46:19 |
julia | :) | 00:46:33 |
jade_ | it also /forces/ good commit hygiene | 00:51:27 |
jade_ | idk if you have noticed the commit history of lix but it is probably one of the cleanest and clearest commit histories i have ever worked with in any project. | 00:51:48 |
strawberry🍓 (it/pup/she/they) 🏳️⚧️ 💜 🦴 (puppygock.gay) | In reply to @jade_:matrix.org it also /forces/ good commit hygiene most underrated thing about projects ever | 00:52:05 |
strawberry🍓 (it/pup/she/they) 🏳️⚧️ 💜 🦴 (puppygock.gay) | idk if it's just the places i hang out in but apparently it's such an unpopular opinion to want clean commit history | 00:52:30 |
Qyriad | see, the thing about clean commit history | 00:53:13 |
jade_ | the thing about gerrit is that it /forces/ it because your commit message is your change description. you have to write something in there for someone to be able to review it and understand where you're coming from | 00:53:35 |
Qyriad | is it sounds like potential dogma right? it sounds like "yeah this is clearly best practices but shrugs" for a lot of people. but clean commit history doesn't just look nice, and it's not even just nice for rebases, it is necessary for code review | 00:54:46 |
jade_ | yeah. github having the change description in two places is wild though | 00:55:23 |
Qyriad | clean commit history is nice for looking back on. but it is necessary to be able to review changes | 00:55:25 |
jade_ | oh right i think i remember that the forgejo AGit flow doesn't update PR descriptions into line with commit messages | 00:56:00 |
strawberry🍓 (it/pup/she/they) 🏳️⚧️ 💜 🦴 (puppygock.gay) | i dont even have high standards, i just dont want PRs to be full of "Update <filename>", "address reviews", "Update <filename>, "address more reviews", etc | 00:56:07 |
strawberry🍓 (it/pup/she/they) 🏳️⚧️ 💜 🦴 (puppygock.gay) | and merged like that | 00:56:16 |
Qyriad | gods ikr | 00:56:20 |
strawberry🍓 (it/pup/she/they) 🏳️⚧️ 💜 🦴 (puppygock.gay) | does no one amend or.. | 00:56:24 |
jade_ | oh, yeah, gerrit actively prevents "address reviews" ever becoming a commit message | 00:56:29 |
jade_ | that's pretty cool that it does that | 00:56:35 |
Qyriad | In reply to@strawberry:puppygock.gay does no one amend or.. well no because amending makes understanding the history of a PR harder! | 00:56:46 |
Qyriad | and this is why people these days just fucking squash everything | 00:56:57 |
jade_ | yeah like, the fundamental way that gh pr reviews work is broken | 00:57:09 |
strawberry🍓 (it/pup/she/they) 🏳️⚧️ 💜 🦴 (puppygock.gay) | yeah but like, i dont get why amending a 2 line diff from a review is bad | 00:57:11 |
strawberry🍓 (it/pup/she/they) 🏳️⚧️ 💜 🦴 (puppygock.gay) | if it's big yes make it a separate commit | 00:57:21 |
Qyriad | it's not, really, but no one cares about commit history because of this whole cycle | 00:57:30 |
jade_ | In reply to @strawberry:puppygock.gay yeah but like, i dont get why amending a 2 line diff from a review is bad oh, another thing that gerrit Fixes is that it has a way better online editor to Just Fix someone's change as a reviewer if you want to submit it with changes. github doesn't let you stage multiple things together into one commit amend, or even let you make a commit amend from web. | 00:58:20 |
strawberry🍓 (it/pup/she/they) 🏳️⚧️ 💜 🦴 (puppygock.gay) | i tried once fixing someone's PR from github UI, and i never ever want to do it again | 00:58:44 |