git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / 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 02/20] refs_read_raw_ref(): new function
Date: Fri, 31 Mar 2017 16:11:00 +0200	[thread overview]
Message-ID: <3962e229cf0eb9daad8b5ed55b98fc9dbdd0d64a.1490966385.git.mhagger@alum.mit.edu> (raw)
In-Reply-To: <cover.1490966385.git.mhagger@alum.mit.edu>

Extract a new function from `refs_resolve_ref_unsafe()`. It will be
useful elsewhere.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
 refs.c               | 11 +++++++++--
 refs/refs-internal.h |  4 ++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/refs.c b/refs.c
index 77a39f8b17..0ed6c3c7a4 100644
--- a/refs.c
+++ b/refs.c
@@ -1326,6 +1326,13 @@ int for_each_rawref(each_ref_fn fn, void *cb_data)
 	return refs_for_each_rawref(get_main_ref_store(), fn, cb_data);
 }
 
+int refs_read_raw_ref(struct ref_store *ref_store,
+		      const char *refname, unsigned char *sha1,
+		      struct strbuf *referent, unsigned int *type)
+{
+	return ref_store->be->read_raw_ref(ref_store, refname, sha1, referent, type);
+}
+
 /* This function needs to return a meaningful errno on failure */
 const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 				    const char *refname,
@@ -1362,8 +1369,8 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 	for (symref_count = 0; symref_count < SYMREF_MAXDEPTH; symref_count++) {
 		unsigned int read_flags = 0;
 
-		if (refs->be->read_raw_ref(refs, refname,
-					   sha1, &sb_refname, &read_flags)) {
+		if (refs_read_raw_ref(refs, refname,
+				      sha1, &sb_refname, &read_flags)) {
 			*flags |= read_flags;
 			if (errno != ENOENT || (resolve_flags & RESOLVE_REF_READING))
 				return NULL;
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 690498698e..6ee9f20dbc 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -165,6 +165,10 @@ struct ref_update {
 	const char refname[FLEX_ARRAY];
 };
 
+int refs_read_raw_ref(struct ref_store *ref_store,
+		      const char *refname, unsigned char *sha1,
+		      struct strbuf *referent, unsigned int *type);
+
 /*
  * Add a ref_update with the specified properties to transaction, and
  * return a pointer to the new object. This function does not verify
-- 
2.11.0


  parent reply	other threads:[~2017-03-31 14:11 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 ` Michael Haggerty [this message]
2017-03-31 14:11 ` [PATCH v2 03/20] refs_ref_iterator_begin(): new function 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 ` [PATCH v2 13/20] refs: handle "refs/bisect/" in `loose_fill_ref_dir()` Michael Haggerty
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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=3962e229cf0eb9daad8b5ed55b98fc9dbdd0d64a.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).