Hi Peff, > I'd expect that the resolve-undo extension would eventually be dropped > once a merge is finished, but I'm not very familiar with that code. Is > the repository in question mid-merge, or does it happen all the time? > > If there are no changes you need to keep in the index or working tree, > I expect that a workaround would be: > > rm -f .git/index > git reset > git update-index --refresh > > to rewrite the index from scratch. Then the problem should not recur, as > you'd be using a version with 5a5ea141e7 from here on out. Thanks! This did the trick for me! I suspect that the problem happened at some point in the past, when I was doing a git merge and git gc concurrently. A whole whack of stuff required recovering at that point in time, and it all appeared to work with the old version. But probably something was still left in the index that referred to, indirectly, 1d0f34d1c. My problem is now solved, I’ll also feed this back to git-users. Thanks! Cheers, Paul
