kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'kn/refs-fsck-skip-lock-files' 

The consistency checks for the files reference backend have been updated
to skip lock files earlier, avoiding unnecessary parsing of
intermediate files.

* kn/refs-fsck-skip-lock-files:
  refs/files: skip lock files during consistency checks
main
Junio C Hamano 2026-05-27 14:15:44 +09:00
parent c5e6e497ac e0fcba2d9c
commit bbcc0ae3e9
2 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
refs/files-backend.c
View File

@ -3853,22 +3853,12 @@ cleanup:
static int files_fsck_refs_name(struct ref_store *ref_store UNUSED,
struct fsck_options *o,
const char *refname,
const char *path,
const char *path UNUSED,
int mode UNUSED)
{
struct strbuf sb = STRBUF_INIT;
const char *filename;
int ret = 0;

filename = basename((char *) path);

/*
* 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"))
goto cleanup;

if (is_root_ref(refname))
goto cleanup;

@ -3928,6 +3918,7 @@ static int files_fsck_refs_dir(struct ref_store *ref_store,
struct strbuf refname = STRBUF_INIT;
struct strbuf sb = STRBUF_INIT;
struct dir_iterator *iter;
const char *filename;
int iter_status;
int ret = 0;

@ -3951,6 +3942,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 skip invalid refnames with '.lock' suffix.
*/
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;

41
t/t0602-reffiles-fsck.sh
View File

@ -87,6 +87,47 @@ test_expect_success 'ref name should be checked' '
)
'

test_expect_success 'lock files should be ignored' '
test_when_finished "rm -rf repo" &&
git init repo &&
(
cd repo &&
git commit --allow-empty -m initial &&
git checkout -b branch-1 &&

touch .git/refs/heads/branch-1.lock &&
git refs verify 2>err &&
test_must_be_empty err &&

echo "foobar" >.git/refs/heads/branch-2 &&
test_must_fail git refs verify 2>err &&
cat >expect <<-EOF &&
error: refs/heads/branch-2: badRefContent: foobar
EOF
test_cmp expect err
)
'

test_expect_success 'bare lock files should not be ignored' '
test_when_finished "rm -rf repo" &&
git init repo &&
(
cd repo &&
git commit --allow-empty -m initial &&
git checkout -b branch-1 &&

# invalid refname should be reported
cp .git/refs/heads/branch-1 .git/refs/heads/.branch-1.lock &&
# invalid refname and content should be reported
touch .git/refs/heads/.lock &&

test_must_fail git refs verify 2>err &&
test_grep "error: refs/heads/.branch-1.lock: badRefName: invalid refname format" err &&
test_grep "error: refs/heads/.lock: badRefName: invalid refname format" err &&
test_grep "error: refs/heads/.lock: badRefContent: " err
)
'

test_expect_success 'ref name check should be adapted into fsck messages' '
test_when_finished "rm -rf repo" &&
git init repo &&