@matheusbsbs / matheus-bagliano / commits / d5b3c38b8a

fsck: ignore missing "refs" directory for linked worktrees

"git refs verify" doesn't work if there are worktrees created on Git v2.43.0 or older versions. These versions don't automatically create the "refs" directory, causing the error: error: cannot open directory .git/worktrees/<worktree name>/refs: No such file or directory Since 8f4c00de95 (builtin/worktree: create refdb via ref backend, 2024-01-08), we automatically create the "refs" directory for new worktrees. And in 7c78d819e6 (ref: support multiple worktrees check for refs, 2024-11-20), we assume that all linked worktrees have this directory and would wrongly report an error to the user, thus introducing compatibility issue. Check for ENOENT errno before reporting directory access errors for linked worktrees to maintain backward compatibility. Reported-by: Kristoffer Haugsbakk <code@khaugsbakk.name> Signed-off-by: shejialuo <shejialuo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

shejialuo committed Jun 2, 2025 at 22:41 UTC d5b3c38b8a1356921a87cc3d435e6de91a9fbff1

2 files changed +22

refs/files-backend.c

@@ -3772,6 +3772,9 @@ static int files_fsck_refs_dir(struct ref_store *ref_store,

3772

3773 iter = dir_iterator_begin(sb.buf, 0);

3774 if (!iter) {

3775 + if (errno == ENOENT && !is_main_worktree(wt))

3776 + goto out;

3777 +

3778 ret = error_errno(_("cannot open directory %s"), sb.buf);

3779 goto out;

3780 }

t/t0602-reffiles-fsck.sh

+19

@@ -106,6 +106,25 @@ test_expect_success 'ref name check should be adapted into fsck messages' '

106 test_must_be_empty err

107 '

108

109 +test_expect_success 'no refs directory of worktree should not cause problems' '

110 + test_when_finished "rm -rf repo" &&

111 + git init repo &&

112 + (

113 + cd repo &&

114 + test_commit initial &&

115 + git worktree add --detach ./worktree &&

116 +

117 + (

118 + cd worktree &&

119 + worktree_refdir="$(git rev-parse --git-dir)/refs" &&

120 + # Simulate old directory layout

121 + rmdir "$worktree_refdir" &&

122 + git refs verify 2>err &&

123 + test_must_be_empty err

124 + )

125 + )

126 +'

127 +

128 test_expect_success 'ref name check should work for multiple worktrees' '

129 test_when_finished "rm -rf repo" &&

130 git init repo &&