new | show | ask | jobs Github

Filligree 7 hours ago

Yet another reason to use Jujutsu. And put a `jj status` wrapper in your PS1. ;-)

▲

diath 7 hours ago | parent | next [-]

> Yet another reason to use Jujutsu

And what would that reason be? You can git revert a git revert.

▲

jsnell 6 hours ago | parent | next [-]

You're correct for an actual git revert, but it seems pretty clear that the original authors have mangled the story and it was actually either a "git checkout" or "git reset". The "file where 1-2 hours of progress had been accumulating" phrasing only makes sense if those were uncommitted changes.

And the reason jj helps in that case is that for jj there is no such thing as an uncommitted change.

▲

block_dagger 5 hours ago | parent | next [-]

Having no such thing as an uncommitted change seems like it would be a nightmare, but perhaps I'm just too git-oriented.

	▲	steveklabnik 4 hours ago \| parent [-]
		Things like the index become a workflow pattern, rather than a feature, if that makes any sense.

▲

MarkMarine 5 hours ago | parent | prev [-]

Also JJ undo is there and easy to tell the model to use, I have it in my Claude.md

	▲	hu3 2 hours ago \| parent [-]
		surely Claude is much better at using git because of the massive training data difference. If it didn't undo git, it would do it with JJ either.

▲

mbb70 6 hours ago | parent | prev [-]

Probably it actually ran git checkout or reset. As you say git revert only operates on committed snapshots so it will all be in the reflog

▲

ewoodrich 5 hours ago | parent [-]

Yes, this exact scenario has happened to me a couple times with both Claude and Codex, and it's usually git checkout, more rarely git reset. They immediately realize they fucked up and spend a few minutes trying to undo by throwing random git commands at it until eventually giving up.

	▲	foobar10000 4 hours ago \| parent [-]
		Yeap - this is why when running it in a dev container, I just use ZFS and set up a 1 minute auto-snapshot - which is set up as root - so it generally cannot blow it away. And cc/codex/gemini know how to deal with zfs snapshots to revert from them. Of course if you give an agentic loop root access in yolo mode - then I am not sure how to help...

▲

westurner 6 hours ago | parent | prev | next [-]

Start with env args like AGENT_ID for indicating which Merkle hash of which model(s) generated which code with which agent(s) and add those attributes to signed (-S) commit messages. For traceability; to find other faulty code generated by the same model and determine whether an agent or a human introduced the fault.

Then, `git notes` is better for signature metadata because it doesn't change the commit hash to add signatures for the commit.

And then, you'd need to run a local Rekor log to use Sigstore attestations on every commit.

Sigstore.dev is SLSA.dev compliant.

Sigstore grants short-lived release attestation signing keys for CI builds on a build farm to sign artifacts with.

So, when jujutsu autocommits agent-generated code, what causes there to be an {{AGENT_ID}} in the commit message or git notes? And what stops a user from forging such attestations?

	▲	westurner 6 hours ago \| parent [-]
		- "Diffwatch – Watch AI agents touch the FS and see diffs live" (2025) https://news.ycombinator.com/item?id=45786382 : > you can manually stage against @-: [with jujutsu]

▲

glemion43 4 hours ago | parent | prev [-]

It's not going to happen...

Stop spamming

▲

dwattttt 3 hours ago | parent | next [-]

The feature of "there is no such thing as an uncommitted working directory" is very relevant to the situation.

▲

glemion43 2 hours ago | parent [-]

It's not. There are so many ways to just solve this non issue that no one will just switch to just another random tool.

Especially not away from git.

	▲	dwattttt an hour ago \| parent [-]
		> It's not Given that other posts solved the problem by scripting this feature on top of git, I guess you're telling them their solution isn't relevant too.

▲

NewsaHackO 4 hours ago | parent | prev [-]

This is funny. I tried it once and didn't see what the benefit was. Then, when I tried to reset it back to normal git, I realized that the devs had not (at the time) made any clean way to revert it back, just a one-way conversion to jj. I haven't tried it since.

	▲	steveklabnik 4 hours ago \| parent [-]
		What were you trying to “revert back”? You should have been able to just stop using jj, there’s nothing to revert back to. It’s also possible that I’m misunderstanding what you mean.