On Wed, Mar 29, 2023 at 06:05:24PM -0400, Stefan Monnier wrote: > Here's an example session: > > % LANG=C git fsck --strict; LANG=C git gc > Checking object directories: 100% (256/256), done. > error in tree 2699d230e3b592ae42506d7b5c969a7ac6a4593c: zeroPaddedFilemode: contains zero-padded file modes > Checking objects: 100% (462555/462555), done. > Verifying commits in commit graph: 100% (117904/117904), done. > Enumerating objects: 462573, done. > Counting objects: 100% (462573/462573), done. > Delta compression using up to 8 threads > Compressing objects: 100% (155363/155363), done. > fatal: unable to read f5e44b38fc8f7e15e5e6718090d05b09912254fa > fatal: failed to run repack > % > > How come it can't read `f5e44b38fc8f7e15e5e6718090d05b09912254fa` during > "repack" while `git fsck` says everything is fine? Do you use separate worktrees? It sounds like it might be similar to this case: https://lore.kernel.org/git/c6246ed5-bffc-7af9-1540-4e2071eff5dc@xxxxxxxx/ If so, there are patches in the current "master" (but not in a released version yet) that fix fsck to detect this. > More importantly: how do I diagnose this further and fix it? If it is the same problem (which would be a blob or maybe cached tree missing in one of the worktree's index files), then probably you'd either: 1. Accept the loss and blow away that worktree's index file (or perhaps even the whole worktree, and just recreate it). 2. Try to "git add" the file in question to recreate the blob (assuming that the file itself is still hanging around). The original corruption bug itself (gc not taking into account worktree index files) has been fixed for a while, so the theory is that this can be lingering corruption from a repack by an older version of Git. But if you have evidence to the contrary, we'd like to hear that, too. ;) > Rumors on the net suggest that `git gc --aggressive` may circumvent this > problem occasionally, but those don't seem to know what they're talking > about, and in my case it didn't make any difference (except that it > takes more time :-). I don't think --aggressive would help at all. In theory --prune=now might, but I think even that won't help if the problem is that the object is referenced in an index file. It could also be a totally unrelated bug, perhaps where we are too eager to complain about missing objects in unreachable history we're trying to retain. In which case "git gc --prune=now" _would_ help (but it might be nice to save a copy of the repository before trying, because that would indicate a bug we still need to fix, and your repo is worth investigating). -Peff
