| 30 Mar 2025 |
continous | So I should submit each separately? | 01:28:12 |
@hexa:lossy.network | the last commit needs to be generated by running ./pkgs/server/home-assistant/update-component-packages.py | 01:28:17 |
@hexa:lossy.network | one PR, three commits | 01:28:21 |
continous | So the last commit I should ommit, or run update-component-packages.py and commit the output? | 01:29:09 |
continous | * So the last commit I should ommit, or run ``update-component-packages.py and commit the output? | 01:29:24 |
continous | * So the last commit I should ommit, or run update-component-packages.py and commit the output? | 01:29:33 |
@hexa:lossy.network | run the script and commit the result with the commit message as above | 01:29:39 |
continous | Ok. | 01:30:41 |
continous | I sent it boys https://github.com/NixOS/nixpkgs/pull/394560 | 09:36:39 |
K900 | Added a few comments | 09:42:04 |
K900 | Feel free to ask here if you have questions | 09:42:15 |
continous | I am still cleaning up a bit, basically. | 09:48:53 |
K900 | Sure, there's no rush | 09:49:28 |
continous | How...or what even...is squashing commits? | 09:49:34 |
K900 | Well there's a bunch of tools that can do it | 09:49:55 |
K900 | Fundamentally what you want to do is have a clean commit history | 09:50:44 |
K900 | It's a different way of thinking about what your commits represent, I guess? | 09:51:46 |
K900 | I'm sorry if I'm getting too philosophical about it | 09:51:54 |
K900 | But the idea is that instead of recording a log of your work, in a big project you want to break down your changes into a stack of patches that build on top of each other | 09:52:31 |
K900 | And every patch does one thing, or at least as close to one thing as possible | 09:52:45 |
K900 | In your case, it would be something like
1) add yourself to maintainer list
2) add the new package with you as maintainer
3) regenerate HA components | 09:53:10 |
continous | Don't worry lol. I've literally never used git before so this is me being entirely fresh to proper "programming" | 09:54:18 |
K900 | Yeah so basically there's kind of two approaches to git | 09:54:41 |
continous | I just don't really know how to remove commits. | 09:54:45 |
K900 | One is what you're doing, which is keeping an actual history of the work | 09:54:49 |
K900 | The other is what I just described, often called the "stacked" workflow | 09:55:17 |
K900 | The built-in git tool for doing all of this would be git rebase | 09:55:44 |
K900 | But it's a pretty sharp tool that is easy to hold wrong | 09:55:59 |
K900 | You might want to use something like https://git-ps.sh/ | 09:57:07 |
continous | What exactly is...rebasing? I know I'm taking up your time so don't feel pressured to answer right away. | 09:58:03 |