From 09e65645e3b092e4d93bb8513b14474c68df23d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Thu, 7 Mar 2019 19:29:15 +0700 Subject: files-backend.c: factor out per-worktree code in loose_fill_ref_dir() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the first step for further cleaning up and extending this function. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- refs/files-backend.c | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'refs') diff --git a/refs/files-backend.c b/refs/files-backend.c index 9183875dad..06ba49f47a 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -213,6 +213,33 @@ static void files_ref_path(struct files_ref_store *refs, } } +/* + * Manually add refs/bisect and refs/worktree, which, being + * per-worktree, might not appear in the directory listing for + * refs/ in the main repo. + */ +static void add_per_worktree_entries_to_dir(struct ref_dir *dir, const char *dirname) +{ + int pos; + + if (strcmp(dirname, "refs/")) + return; + + 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); + } + + pos = search_ref_dir(dir, "refs/worktree/", 11); + if (pos < 0) { + struct ref_entry *child_entry = + create_dir_entry(dir->cache, "refs/worktree/", 11, 1); + add_entry_to_dir(dir, child_entry); + } +} + /* * Read the loose references from the namespace dirname into dir * (without recursing). dirname must end with '/'. dir must be the @@ -296,28 +323,7 @@ static void loose_fill_ref_dir(struct ref_store *ref_store, strbuf_release(&path); closedir(d); - /* - * Manually add refs/bisect and refs/worktree, 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); - } - - pos = search_ref_dir(dir, "refs/worktree/", 11); - - if (pos < 0) { - struct ref_entry *child_entry = create_dir_entry( - dir->cache, "refs/worktree/", 11, 1); - add_entry_to_dir(dir, child_entry); - } - } + add_per_worktree_entries_to_dir(dir, dirname); } static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs) -- cgit v1.2.3