PSA: Did you know that it’s **unsafe** to put code diffs into your commit messages?

Like https://github.com/i3/i3/pull/6564 for example

Such diffs will be applied by patch(1) (also git-am(1)) as part of the code change!

This is how a sleep(1) made it into i3 4.25-2 in Debian unstable.

FWIW, git cherry-pick works as expected (at least)

@zekjur brb gonna send some funny patches

@zekjur okay I think it’s time to light git on fire and start using something else

@lightbites @zekjur jujutsu seems nice! hopefully it hasn’t inherited the same footgun from git

@lightbites @zekjur unfortunately I think that git use is so widespread at this point that any project like Jujutsu is forced to abstract the filesystem-level details of how the repository is stored - since any new VCS would otherwise be incompatible with the overwhelming majority of software projects that one might want to work on

I definitely agree that simplicity is better, but I’m not sure if there’s a good alternative here unfortunately - except maybe to have a second tool whose purpose is to translate between one VCS and another? but even then that would still be introducing the same amount of complexity - it would just be offloading the complexity to a second tool

@kasdeya you mean you apply email patches on a daily basis?