Git Mailing List Archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: git@vger.kernel.org
Subject: Re: `git gc` says "unable to read" but `git fsck` happy
Date: Wed, 29 Mar 2023 19:37:35 -0400	[thread overview]
Message-ID: <20230329233735.GD2314218@coredump.intra.peff.net> (raw)
In-Reply-To: <jwvfs9nusjm.fsf-monnier+Inbox@gnu.org>

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@kdbg.org/

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

  reply	other threads:[~2023-03-29 23:37 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-29 22:05 `git gc` says "unable to read" but `git fsck` happy Stefan Monnier
2023-03-29 23:37 ` Jeff King [this message]
2023-03-30 13:01   ` Stefan Monnier
2023-03-30 18:17     ` Jeff King
2023-06-01 12:04       ` Andreas Schwab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230329233735.GD2314218@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=monnier@iro.umontreal.ca \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).