Skip to content

Commit e3bf298

Browse files
mhaggergitster
authored andcommitted
refs: handle "refs/bisect/" in loose_fill_ref_dir()
That "refs/bisect/" has to be handled specially when filling the ref_cache for loose references is a peculiarity of the files backend, and the ref-cache code shouldn't need to know about it. So move this code to the callback function, `loose_fill_ref_dir()`. Signed-off-by: Michael Haggerty <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent df30875 commit e3bf298

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

refs/files-backend.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,21 @@ static void loose_fill_ref_dir(struct ref_store *ref_store,
507507
strbuf_release(&refname);
508508
strbuf_release(&path);
509509
closedir(d);
510+
511+
/*
512+
* Manually add refs/bisect, which, being per-worktree, might
513+
* not appear in the directory listing for refs/ in the main
514+
* repo.
515+
*/
516+
if (!strcmp(dirname, "refs/")) {
517+
int pos = search_ref_dir(dir, "refs/bisect/", 12);
518+
519+
if (pos < 0) {
520+
struct ref_entry *child_entry = create_dir_entry(
521+
dir->cache, "refs/bisect/", 12, 1);
522+
add_entry_to_dir(dir, child_entry);
523+
}
524+
}
510525
}
511526

512527
static struct ref_dir *get_loose_refs(struct files_ref_store *refs)

refs/ref-cache.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,6 @@ struct ref_dir *get_ref_dir(struct ref_entry *entry)
2626
die("BUG: incomplete ref_store without fill_ref_dir function");
2727

2828
dir->cache->fill_ref_dir(dir->cache->ref_store, dir, entry->name);
29-
30-
/*
31-
* Manually add refs/bisect, which, being
32-
* per-worktree, might not appear in the directory
33-
* listing for refs/ in the main repo.
34-
*/
35-
if (!strcmp(entry->name, "refs/")) {
36-
int pos = search_ref_dir(dir, "refs/bisect/", 12);
37-
if (pos < 0) {
38-
struct ref_entry *child_entry;
39-
child_entry = create_dir_entry(dir->cache,
40-
"refs/bisect/",
41-
12, 1);
42-
add_entry_to_dir(dir, child_entry);
43-
}
44-
}
4529
entry->flag &= ~REF_INCOMPLETE;
4630
}
4731
return dir;

0 commit comments

Comments
 (0)