Thanks Mathias! This patch seems to have gained some traction as well, so I am glad that my pain lead to some improvement :-)
Cheers, Paul On Tuesday, October 18, 2022 at 5:42:47 PM UTC+2 Mathias Rav wrote: > On Monday, October 17, 2022 at 8:27:44 PM UTC+2 Paul wrote: > >> Based on the above, I contacted the git list, and got a response from >> Jeff: >> > It sounds like there's a resolve-undo extension in your index >> that references that blob, but the blob was removed from the >> repository (probably by a gc prior to 5a5ea141e7, which was trying to >> prevent this corruption). >> > >> > 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. >> >> I did this, and my problem is now solved. >> > > That's a nice workaround - thanks! > > I prepared a patch that should fix the issue for all users without any > workaround: > https://github.com/git/git/compare/master...Mortal:git:revision_resolve_undo_missing_blobs?expand=1 > > I'll submit this patch shortly. > > Cheers, > Mathias > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/579c0c45-983f-44cd-b154-99ca8c224020n%40googlegroups.com.
