Programming
Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!
Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.
Hope you enjoy the instance!
Rules
Rules
- Follow the programming.dev instance rules
- Keep content related to programming in some way
- If you're posting long videos try to add in some form of tldr for those who don't want to watch videos
Wormhole
Follow the wormhole through a path of communities !webdev@programming.dev
... if you have a super janky patch file workflow.
If you are using Git like normal people do this can't happen.
The Linux kernel development workflow, the purpose for which git was invented, makes use of emailed patches https://docs.kernel.org/process/submitting-patches.html
… which arguably makes them not "normal people" (referring to the earlier comment).
Surely, most people use different, more integrated tooling.
Yeah it's mad. Tbh I don't think GitHub PRs are the best workflow, but I absolutely know that git send-email is the worst. I tried to use it once to contribute to OpenSBI, which inexplicably also insists on it. Suffice it to say my patch was never merged...
Why didn't your patch get merged?
They wanted me to make some changes and with the normal workflow that's just git commit and git push. With git send-email I have no fucking idea and it got beyond the point where I had enough cared enough to fight the process.
Oh I see! Thanks. I thought that they deliberately rejected your patch. But it was more about the red tape getting in the way. Yeah, that sounds frustrating.
Hooray to underspecified file formats.
From patch(1):
patch tries to skip any leading garbage, apply the diff, and then skip any trailing garbage. Thus you could feed an email message containing a diff listing to patch, and it should work.
From git-am(1):
The patch is expected to be inline, directly following the message. Any line that is of the form:
- three-dashes and end-of-line, or
- a line that begins with "diff -", or
- a line that begins with "Index: "
is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line.
Ideally git-am should use a better file format, but I suppose the more realistic lesson now is to never have inline diffs in Commit messages.
Context: this happens if you use patch(1) with patches generated by git format-patch. If you do, you should be using git am instead.
It happens when you use git-am as well, per the thread
Ha. Lol. That's bad
The final verdict being “it’s working as intended” is fully wild to me.