Re: [PATCH] refs/files: skip lock files during consistency checks
- From
Christian Couder <christian.couder@gmail.com>
- Date
- Apr 21, 2026, 08:18 UTC
- Message-ID
- <CAP8UFD2vO415UfEUw34_Whh3bTG0ECV99APH=uaDyiGLiNq1yw@mail.gmail.com>
- In-Reply-To
- <20260420-refs-fsck-skip-lock-files-v1-1-c2595e206a76@gmail.com>
On Mon, Apr 20, 2026 at 5:21 PM Karthik Nayak <karthik.188@gmail.com> wrote:
Show 16 quoted lines
> @@ -3962,6 +3953,15 @@ static int files_fsck_refs_dir(struct ref_store *ref_store, > strbuf_addf(&refname, "worktrees/%s/", wt->id); > strbuf_addf(&refname, "refs/%s", iter->relative_path); > > + filename = basename((char *) iter->path.buf); > + > + /* > + * Ignore the files ending with ".lock" as they may be lock files > + * However, do not allow bare ".lock" files. > + */ > + if (filename[0] != '.' && ends_with(filename, ".lock")) > + continue; > + > if (files_fsck_ref(ref_store, o, refname.buf, > iter->path.buf, iter->st.st_mode) < 0) > ret = -1;
This just moves code and associated comments, so the following are probably pre-existing issues, but still it seems to me that:
- "do not allow" is not quite what is actually done. There is no ret = -1 set for example, so if files_fsck_ref() succeeds with the ".lock" file it could be allowed, or I am missing something?
- a filename like ".stuff.lock" would be treated in the same way as ".lock". I wonder if it's what we want.
Maybe ".lock" or ".stuff.lock" would fail a check_refname_format() somewhere, if they are not ignored, but it's still a bit confusing.
It seems to me that either:
1) we want to ignore all files that end with ".lock" as they might be used by some tool as lockfiles, and then:
if (ends_with(iter->path.buf, ".lock"))
continue;is enough, or
2) we want to check that all files matching "XXXX.lock" correspond to a valid XXXX ref, and then we should not completely ignore them, just ignore their content but check the XXXX part.
For a bug fix, I think implementing 1) is enough. We could implement 2) if we think it's worth it in a separate improvement (with perhaps a new "staleLockFile" fsck message).
Thanks.