From: Christian Weisgerber <naddy@mips.inka.de>
Subject: Re: histedit: How to fold M, D?
To: gameoftrees@openbsd.org
Date: Wed, 26 Jul 2023 17:23:04 +0200

Stefan Sperling:

> > Oh sorry this diff won't work as-is since it assumes that the
> > blob ID passed in already matches the file on disk. I will have
> > to revisit this, adding an object ID lookup.
> 
> Try this one please. Also fixes small leaks in unlikely error paths.

That doesn't quite work:

81474c680f54 ->  fold commit: revert: Implement PAC support.
...
4b1696fbab55 -> 3790f01fbf94: llvm: revert to 13.0.0
...
0d86ca54faea -> 31c8452f490b: llvm: update to 15.0.7
...
got: duplicate entry in tree object


Also, aborting the operation:

$ got he -a
...
got: gnu/llvm/lldb/source/Plugins/Process/OpenBSD/CMakeLists.txt: duplicate file index entry


Hmpf.  FWIW, "got up" recovers from this.

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de