frontpage.
newsnewestaskshowjobs

Made with ♥ by @iamnishanth

Open Source @Github

fp.

Open in hackernews

Working with Git Patches in Apple Mail (2023)

https://btxx.org/posts/mail/
50•todsacerdoti•6mo ago

Comments

johnrob•6mo ago
Once I discovered how git apply can take diff files (or patch files) as input, I stopped using git stash in favor of plain old files. Easier to list and browse the contents of prior edits, also you can grep the files as method of search. I’ve even found myself copying and editing the diffs before applying.
barbazoo•6mo ago
Oh that’s clever, I’ll try that out. Looks like you could just do a git diff > file.patch.

Neat.

johnrob•6mo ago
You’ll also want to familiarize with “git apply -3 <file name>”, for when a diff can’t be applied cleanly. It will try “harder” to merge (three way method) and if it still fails it invokes the conflict merge “UX”:

<<<<<<<<<

=========

>>>>>>>>>

smcameron•6mo ago
There's also Neil Brown's "wiggle" program for applying patches that don't apply.

https://github.com/neilbrown/wiggle

although on debian based systems I think you can just "apt install wiggle"

johnisgood•6mo ago
What does "applying patches that don't apply" mean exactly?

I know about wiggle, but I have not used it, to be honest.

smcameron•6mo ago
It means that if you do "patch -p1 --dry-run < some.patch", and it complains that it doesn't apply, wiggle can sometimes apply it anyway, and also, if you do "patch -p1 < some.patch", and it partially applies but with rejected hunks, wiggle can try to apply the rejected hunks.
johannes1234321•6mo ago
git diff an pipe works, but committing and then `git format-patch` can export multiple patches and then includes metadata (commit message, date, author, etc.) which can make reasoning about such files a lot easier. In a plain diff you only got filename as metadata.
RaoulP•6mo ago
That’s a great idea, and very timely for me.
d3ckard•6mo ago
Thank you, will try. Useful bit of knowledge.
OskarS•6mo ago
That is a very neat trick, I agree.

I personally approaches stashes as undoable "clean up", and I never have anything really important that I want to save there. If I do have something like that, I just commit with a "WIP <some-descriptive-string>" message and don't push it, then a "git reset --mixed HEAD^" when I want to get back to it.

However, just FYI: you can "grep" your stashes really easily if you want to. just "git stash list -p" gives you the diffs for all the stashes, by default in "less" where you can search them, but you can pipe it to grep if you want. I somewhat frequently do that with "git log", if I want to know "when did this variable change?" or whatever, just "git log -p" to get the log with diffs in less, then search for whatever it was with a slash.

teeray•6mo ago
Maybe slightly O/T, but has anyone found a decent way to `git send-email` with email hosts that demand OAuth? (looking at you Outlook and Gmail)
ravetcofx•6mo ago
Generating app passwords for those would work.
pm215•6mo ago
Yeah, I use an app specific password with Gmail, like the setup suggested by https://git-send-email.io/#step-2

Exchange historically had a tendency to mangle emails sent through it (whitespace changes, line wrap, etc), which is obviously bad news for patchmails. I dunno if it's any better these days.

computerfriend•6mo ago
For Gmail, you can use https://github.com/google/gmail-oauth2-tools/tree/master/go/....
mathstuf•6mo ago
I use msmtp with a tool from the oauth2-tools repo to do the rotation token dance. Need to register your own app with Google though.
dmarinus•6mo ago
davmail supports smtp through outlook(365)
ndegruchy•6mo ago
Yeah, I used DAVMail with Emacs+MSMTP+MPOP+notmuch for ages. Works really well, the only occasional thing I had to do was reauthenticate the token, which pops up in a browser window.
ozarker•6mo ago
I think you could set up postfix to smtp forward to those services. So it could handle the oauth2 and you wouldn’t need to configure your client
p_wood•6mo ago
I use an app password but https://github.com/AdityaGarg8/git-credential-email apparently supports OAuth with Gmail, yahoo and outlook
arthurmorgan123•6mo ago
I tried this with Gmail and Outlook. Works flawlessly and also doesn't need to authenticate frequently. The Authen::SASL thing was a catch though.

git-send-email also has some quirks for Outlook which have been recently merged.

palata•6mo ago
I like doing it with aerc [1]. It's even possible to use aerc in parallel to another email client. Just open aerc for git-related emails, and that's it!

[1]: https://drewdevault.com/2022/07/25/Code-review-with-aerc.htm...

kazinator•6mo ago
View the e-mail raw in your browser, select all, copy, paste into git apply.

Then you don't need that message to be in a file-based inbox that is accessible from your git repo.

And in that case you are still likely going to have to copy and paste something to get the correct path.

sircastor•6mo ago
It looks like Apple Mail has plugin support, I wonder if you could author a plugin that’d provide a button to apply the diff.
smcameron•6mo ago
If you work with git and patches a lot, stgit is worth a look.

https://stacked-git.github.io

johnisgood•6mo ago
At that point, why not just use Pijul or even Darcs?
smcameron•6mo ago
Because the codebase you're working on is on github?

And I think you may underestimate the power of stgit. You can manage thousands of patches concurrently, no problem. If you're a maintainer getting patches from loads of people all the time, this is valuable. stgit has it's origins in quilt, which in turn has its origins in Andrew Morton's patch scripts[1], and I know for a fact that Andrew Morton actually managed thousands of patches at a time for years in his work on the linux kernel, because I once sent him a patch against those scripts, and he complained it was slow because I used an O(n^2) algorithm, which worked fine with a handful of patches, and I asked him how many patches he had, and he told me a number that was multiple thousands, so this isn't a hypothetical example.

[1] https://lwn.net/Articles/13518/

Post-Quantum Cryptography on CHERIoT

https://cheriot.org/pqc/2025/12/12/pqc-on-cheriot.html
1•todsacerdoti•1m ago•0 comments

Arkansas becoming first state to sever ties with PBS, effective July 1

https://www.ctvnews.ca/world/article/arkansas-becoming-1st-state-to-sever-ties-with-pbs-effective...
1•kotaKat•2m ago•0 comments

Trump signs order to block states from enforcing own AI rules

https://www.bbc.com/news/articles/crmddnge9yro
2•deliass•3m ago•0 comments

Defrag.exfat Is Inefficient and Dangerous

https://github.com/exfatprogs/exfatprogs/issues/318
1•dxdxdt•4m ago•0 comments

The Beauty of Dissonance

https://www.plough.com/en/topics/culture/music/the-beauty-of-dissonance
1•tintinnabula•8m ago•0 comments

A LLM trained only on data from certain time periods to reduce modern bias

https://github.com/haykgrigo3/TimeCapsuleLLM
2•jpalomaki•9m ago•0 comments

Show HN: StudioArt, A photo sharing website for creatives

https://atstudioart.netlify.app/
1•telui•11m ago•0 comments

Measuring postMessage Delays with the Delayed Message Timing API

https://blogs.windows.com/msedgedev/2025/12/09/making-complex-web-apps-faster/
1•joonehur•12m ago•1 comments

Rebuilding Our Website for the Agent Era

https://www.prefect.io/blog/rebuilding-our-website-for-the-agent-era
3•cicdw•14m ago•1 comments

Engineering analysis of 3I/ATLAS as a sublimation-driven body

https://osf.io/w23nv
2•Alis_Muzar•15m ago•0 comments

Show HN: EdgeVec – Sub-millisecond vector search in the browser (Rust/WASM)

https://github.com/matte1782/edgevec
1•matteo1782•19m ago•1 comments

'Mamdani Effect' Is Seeing More People Moving to New York, Not Leaving It

https://www.newsweek.com/mamdani-effect-more-people-moving-new-york-city-not-leaving-11193747
1•saubeidl•20m ago•0 comments

Portals must bend gravity [video]

https://www.youtube.com/watch?v=DydIhwLrbMk
1•ahlCVA•20m ago•0 comments

Show HN: I needed to record mobile web demos with my face, so I built this

https://www.youtube.com/watch?v=c_fq0TzlsXI
1•admtal•21m ago•0 comments

Show HN: PharmVault – Secure Notes with Spring Boot and JWT

https://github.com/nifski/PharmVault
1•nifemi1234•21m ago•2 comments

GPT 5.2 on the Counter-Strike Benchmark

https://www.instantdb.com/essays/gpt_52_on_the_counterstrike_benchmark
2•stopachka•23m ago•0 comments

How does one analyse all states of a puzzle game like Stephen's Sausage Roll? [video]

https://www.youtube.com/watch?v=AK8OLuRBFTw
1•yellow_postit•24m ago•0 comments

Deletion is never guaranteed: How your computer lies to you

https://ulveon.net/p/2025-11-01-deletion-is-never-guaranteed-how-your-computer-lies-to-you/
1•kevin061•24m ago•0 comments

Can I use HTTPS RRs?

https://www.netmeister.org/blog/https-caniuse.html
2•zdw•24m ago•1 comments

Arizona city rejects data center after AI lobbying push

https://www.politico.com/news/2025/12/12/arizona-city-rejects-data-center-after-ai-lobbying-push-...
4•thunderbong•26m ago•0 comments

Fine-tuning Gemma 3 for mobile

https://opensource.googleblog.com/2025/12/empowering-app-developers-fine-tuning-gemma-3-for-mobil...
1•nkko•31m ago•0 comments

Working at Cold War Los Alamos

https://doomsdaymachines.net/p/working-at-cold-war-los-alamos
2•chmaynard•33m ago•0 comments

Shifting climate boundaries for European peatlands

https://iopscience.iop.org/article/10.1088/1748-9326/ae2142
1•PaulHoule•34m ago•0 comments

Don't Gobble Up Errors

https://programming.protips.wiki/dont-gobble-up-errors/
1•markl42•35m ago•0 comments

Cadbury Ruined Its Taste and Betrayed Britain [video]

https://www.youtube.com/watch?v=-dIAqAcEiDY
2•076ae80a-3c97-4•37m ago•1 comments

Every Meeting Should Start on Time (If You Want It to Be Productive)

https://www.inc.com/jeff-haden/science-says-every-meeting-should-always-start-on-time-if-you-want...
1•laurex•39m ago•1 comments

Sanity Check Documents with Riftur

https://5iprojects.com/mind-the-gap-part-ii-introducing-riftur-our-first-ai-gap-analysis-tool-for...
2•jcitsme•50m ago•0 comments

Wine 11.0 RC2 – Run Windows Applications on Linux, BSD, Solaris and macOS

https://gitlab.winehq.org/wine/wine/-/releases/wine-11.0-rc2
13•neustradamus•54m ago•0 comments

GCP Error Fixing Bot

https://medium.com/@paulmcdonald/we-built-a-bot-that-reads-our-production-errors-and-opens-prs-wi...
1•pmmucsd•56m ago•0 comments

Show HN: Tiny VM sandbox in C with apps in Rust, C and Zig

https://github.com/ringtailsoftware/uvm32
23•trj•56m ago•0 comments