diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2017-04-16 06:41:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-17 04:32:46 (GMT) |
| commit | e3bf2989cad99b67fceeb55ff7b822b5a7e1aff2 (patch) | |
| tree | 806870c7c35277af44f4e4279bd986ce64b732da /refs | |
| parent | df30875987329bb46e54ec7be0eb29c33702de3a (diff) | |
| download | git-e3bf2989cad99b67fceeb55ff7b822b5a7e1aff2.zip git-e3bf2989cad99b67fceeb55ff7b822b5a7e1aff2.tar.gz git-e3bf2989cad99b67fceeb55ff7b822b5a7e1aff2.tar.bz2 | |
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 <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs')
| -rw-r--r-- | refs/files-backend.c | 15 | ||||
| -rw-r--r-- | refs/ref-cache.c | 16 |
2 files changed, 15 insertions, 16 deletions
diff --git a/refs/files-backend.c b/refs/files-backend.c index ff9251b..079ba94 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -507,6 +507,21 @@ static void loose_fill_ref_dir(struct ref_store *ref_store, strbuf_release(&refname); strbuf_release(&path); closedir(d); + + /* + * Manually add refs/bisect, which, being per-worktree, might + * not appear in the directory listing for refs/ in the main + * repo. + */ + if (!strcmp(dirname, "refs/")) { + int pos = search_ref_dir(dir, "refs/bisect/", 12); + + if (pos < 0) { + struct ref_entry *child_entry = create_dir_entry( + dir->cache, "refs/bisect/", 12, 1); + add_entry_to_dir(dir, child_entry); + } + } } static struct ref_dir *get_loose_refs(struct files_ref_store *refs) diff --git a/refs/ref-cache.c b/refs/ref-cache.c index 7f247b9..44440e0 100644 --- a/refs/ref-cache.c +++ b/refs/ref-cache.c @@ -26,22 +26,6 @@ struct ref_dir *get_ref_dir(struct ref_entry *entry) die("BUG: incomplete ref_store without fill_ref_dir function"); dir->cache->fill_ref_dir(dir->cache->ref_store, dir, entry->name); - - /* - * Manually add refs/bisect, which, being - * per-worktree, might not appear in the directory - * listing for refs/ in the main repo. - */ - if (!strcmp(entry->name, "refs/")) { - int pos = search_ref_dir(dir, "refs/bisect/", 12); - if (pos < 0) { - struct ref_entry *child_entry; - child_entry = create_dir_entry(dir->cache, - "refs/bisect/", - 12, 1); - add_entry_to_dir(dir, child_entry); - } - } entry->flag &= ~REF_INCOMPLETE; } return dir; |