All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Jeff King" <peff@peff.net>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Stefan Beller" <sbeller@google.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
	"David Turner" <novalis@novalis.org>,
	git@vger.kernel.org, "Michael Haggerty" <mhagger@alum.mit.edu>
Subject: [PATCH v2 13/20] refs: handle "refs/bisect/" in `loose_fill_ref_dir()`
Date: Fri, 31 Mar 2017 16:11:11 +0200	[thread overview]
Message-ID: <1254a76cd06f6fbf0d5820b7d0ccc148413c4b16.1490966385.git.mhagger@alum.mit.edu> (raw)
In-Reply-To: <cover.1490966385.git.mhagger@alum.mit.edu>

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>
---
 refs/files-backend.c | 15 +++++++++++++++
 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 e4d78393ac..7b5f5c1240 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -508,6 +508,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 7f247b9170..44440e0c13 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;
-- 
2.11.0


  parent reply	other threads:[~2017-03-31 14:12 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-31 14:10 [PATCH v2 00/20] Separate `ref_cache` into a separate module Michael Haggerty
2017-03-31 14:10 ` [PATCH v2 01/20] get_ref_dir(): don't call read_loose_refs() for "refs/bisect" Michael Haggerty
2017-03-31 17:18   ` Stefan Beller
2017-03-31 14:11 ` [PATCH v2 02/20] refs_read_raw_ref(): new function Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 03/20] refs_ref_iterator_begin(): " Michael Haggerty
2017-04-07 10:57   ` Duy Nguyen
2017-04-16  4:39     ` Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 04/20] refs_verify_refname_available(): implement once for all backends Michael Haggerty
2017-04-07 11:20   ` Duy Nguyen
2017-04-16  4:44     ` Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 05/20] refs_verify_refname_available(): use function in more places Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 06/20] ref-cache: rename `add_ref()` to `add_ref_entry()` Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 07/20] ref-cache: rename `find_ref()` to `find_ref_entry()` Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 08/20] ref-cache: rename `remove_entry()` to `remove_entry_from_dir()` Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 09/20] refs: split `ref_cache` code into separate files Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 10/20] ref-cache: introduce a new type, ref_cache Michael Haggerty
2017-04-07 11:32   ` Duy Nguyen
2017-04-16  4:52     ` Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 11/20] refs: record the ref_store in ref_cache, not ref_dir Michael Haggerty
2017-04-07 11:38   ` Duy Nguyen
2017-04-16  5:49     ` Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 12/20] ref-cache: use a callback function to fill the cache Michael Haggerty
2017-03-31 14:11 ` Michael Haggerty [this message]
2017-03-31 14:11 ` [PATCH v2 14/20] do_for_each_entry_in_dir(): eliminate `offset` argument Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 15/20] get_loose_ref_dir(): function renamed from get_loose_refs() Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 16/20] get_loose_ref_cache(): new function Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 17/20] cache_ref_iterator_begin(): make function smarter Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 18/20] commit_packed_refs(): use reference iteration Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 19/20] files_pack_refs(): " Michael Haggerty
2017-04-07 11:51   ` Duy Nguyen
2017-04-16  6:13     ` Michael Haggerty
2017-03-31 14:11 ` [PATCH v2 20/20] do_for_each_entry_in_dir(): delete function Michael Haggerty
2017-03-31 16:01 ` [PATCH v2 00/20] Separate `ref_cache` into a separate module Junio C Hamano
2017-04-01  5:16   ` Michael Haggerty
2017-04-05 14:03     ` Duy Nguyen
2017-04-07 11:53       ` Duy Nguyen
2017-04-16  6:15         ` Michael Haggerty
2017-04-01 21:26   ` Ramsay Jones
2017-04-02  3:38     ` Junio C Hamano
2017-04-02 14:48       ` Ramsay Jones
2017-04-02 16:44         ` Junio C Hamano
2017-04-01  6:20 ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1254a76cd06f6fbf0d5820b7d0ccc148413c4b16.1490966385.git.mhagger@alum.mit.edu \
    --to=mhagger@alum.mit.edu \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=novalis@novalis.org \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=sbeller@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.