git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Cc: David Turner <dturner@twopensource.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 01/24] refs: move head_ref{,_submodule} to the common code
Date: Thu,  7 Apr 2016 15:02:48 -0400	[thread overview]
Message-ID: <1460055791-23313-2-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1460055791-23313-1-git-send-email-dturner@twopensource.com>

These don't use any backend-specific functions.  These were previously
defined in terms of the do_head_ref helper function, but since they
are otherwise identical, we don't need that function.

Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 refs.c               | 23 +++++++++++++++++++++++
 refs/files-backend.c | 28 ----------------------------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/refs.c b/refs.c
index b0e6ece..6b8c16c 100644
--- a/refs.c
+++ b/refs.c
@@ -1080,3 +1080,26 @@ int rename_ref_available(const char *oldname, const char *newname)
 	strbuf_release(&err);
 	return ret;
 }
+
+int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+	struct object_id oid;
+	int flag;
+
+	if (submodule) {
+		if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0)
+			return fn("HEAD", &oid, 0, cb_data);
+
+		return 0;
+	}
+
+	if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag))
+		return fn("HEAD", &oid, flag, cb_data);
+
+	return 0;
+}
+
+int head_ref(each_ref_fn fn, void *cb_data)
+{
+	return head_ref_submodule(NULL, fn, cb_data);
+}
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 81f68f8..c07dc41 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1745,34 +1745,6 @@ static int do_for_each_ref(struct ref_cache *refs, const char *base,
 	return do_for_each_entry(refs, base, do_one_ref, &data);
 }
 
-static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data)
-{
-	struct object_id oid;
-	int flag;
-
-	if (submodule) {
-		if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0)
-			return fn("HEAD", &oid, 0, cb_data);
-
-		return 0;
-	}
-
-	if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag))
-		return fn("HEAD", &oid, flag, cb_data);
-
-	return 0;
-}
-
-int head_ref(each_ref_fn fn, void *cb_data)
-{
-	return do_head_ref(NULL, fn, cb_data);
-}
-
-int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
-{
-	return do_head_ref(submodule, fn, cb_data);
-}
-
 int for_each_ref(each_ref_fn fn, void *cb_data)
 {
 	return do_for_each_ref(&ref_cache, "", fn, 0, 0, cb_data);
-- 
2.4.2.767.g62658d5-twtrsrc

  reply	other threads:[~2016-04-07 19:03 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-07 19:02 [PATCH 00/24] Yet another pre-refs-backend series David Turner
2016-04-07 19:02 ` David Turner [this message]
2016-04-07 19:02 ` [PATCH 02/24] refs: move for_each_*ref* functions into common code David Turner
2016-04-07 19:02 ` [PATCH 03/24] t1430: test the output and error of some commands more carefully David Turner
2016-04-08 15:14   ` Michael Haggerty
2016-04-08 19:26     ` David Turner
2016-04-08 20:43       ` Junio C Hamano
2016-04-08 21:57         ` David Turner
2016-04-07 19:02 ` [PATCH 04/24] t1430: clean up broken refs/tags/shadow David Turner
2016-04-07 19:02 ` [PATCH 05/24] t1430: don't rely on symbolic-ref for creating broken symrefs David Turner
2016-04-07 19:02 ` [PATCH 06/24] t1430: test for-each-ref in the presence of badly-named refs David Turner
2016-04-07 19:02 ` [PATCH 07/24] t1430: improve test coverage of deletion " David Turner
2016-04-07 19:02 ` [PATCH 08/24] resolve_missing_loose_ref(): simplify semantics David Turner
2016-04-07 19:02 ` [PATCH 09/24] resolve_ref_unsafe(): use for loop to count up to MAXDEPTH David Turner
2016-04-07 19:02 ` [PATCH 10/24] resolve_ref_unsafe(): ensure flags is always set David Turner
2016-04-07 19:02 ` [PATCH 11/24] resolve_ref_1(): eliminate local variable David Turner
2016-04-07 19:02 ` [PATCH 12/24] resolve_ref_1(): reorder code David Turner
2016-04-07 19:03 ` [PATCH 13/24] resolve_ref_1(): eliminate local variable "bad_name" David Turner
2016-04-07 19:03 ` [PATCH 14/24] files-backend: break out ref reading David Turner
2016-04-07 19:03 ` [PATCH 15/24] read_raw_ref(): manage own scratch space David Turner
2016-04-07 19:03 ` [PATCH 16/24] Inline resolve_ref_1() into resolve_ref_unsafe() David Turner
2016-04-07 19:03 ` [PATCH 17/24] read_raw_ref(): change flags parameter to unsigned int David Turner
2016-04-07 19:03 ` [PATCH 18/24] fsck_head_link(): remove unneeded flag variable David Turner
2016-04-07 19:03 ` [PATCH 19/24] cmd_merge(): " David Turner
2016-04-07 19:03 ` [PATCH 20/24] checkout_paths(): " David Turner
2016-04-07 19:03 ` [PATCH 21/24] check_aliased_update(): check that dst_name is non-NULL David Turner
2016-04-07 19:03 ` [PATCH 22/24] show_head_ref(): check the result of resolve_ref_namespace() David Turner
2016-04-07 19:03 ` [PATCH 23/24] refs: move resolve_ref_unsafe into common code David Turner
2016-04-07 19:03 ` [PATCH 24/24] refs: on symref reflog expire, lock symref not referrent David Turner
2016-04-07 22:29 ` [PATCH 00/24] Yet another pre-refs-backend series Junio C Hamano
2016-04-09 16:19 ` Michael Haggerty
2016-04-10  2:10   ` Junio C Hamano

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=1460055791-23313-2-git-send-email-dturner@twopensource.com \
    --to=dturner@twopensource.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mhagger@alum.mit.edu \
    /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 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 NNTP newsgroup(s).