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, pclouds@gmail.com
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v6 01/32] refs: move head_ref{,_submodule} to the common code
Date: Wed, 24 Feb 2016 17:58:33 -0500	[thread overview]
Message-ID: <1456354744-8022-2-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1456354744-8022-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>
---
 refs.c               | 23 +++++++++++++++++++++++
 refs/files-backend.c | 28 ----------------------------
 2 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/refs.c b/refs.c
index e2d34b2..4367c14 100644
--- a/refs.c
+++ b/refs.c
@@ -1082,3 +1082,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 b569762..2e2a6d9 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1753,34 +1753,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-02-24 23:01 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-24 22:58 [PATCH v6 00/32] refs backend David Turner
2016-02-24 22:58 ` David Turner [this message]
2016-02-24 22:58 ` [PATCH v6 02/32] refs: move for_each_*ref* functions into common code David Turner
2016-02-24 22:58 ` [PATCH v6 03/32] files-backend: break out ref reading David Turner
2016-02-25  0:21   ` Junio C Hamano
2016-02-25  0:51     ` Junio C Hamano
2016-02-25 20:11       ` David Turner
2016-02-25 20:27         ` Junio C Hamano
2016-02-24 22:58 ` [PATCH v6 04/32] refs: move resolve_ref_unsafe into common code David Turner
2016-02-25  0:22   ` Junio C Hamano
2016-02-24 22:58 ` [PATCH v6 05/32] refs: add a backend method structure with transaction functions David Turner
2016-02-27  4:06   ` Jeff King
2016-02-29 20:43     ` David Turner
2016-02-24 22:58 ` [PATCH v6 06/32] refs: add methods for misc ref operations David Turner
2016-02-24 22:58 ` [PATCH v6 07/32] refs: add method for do_for_each_ref David Turner
2016-02-24 22:58 ` [PATCH v6 08/32] refs: reduce the visibility of do_for_each_ref() David Turner
2016-02-24 22:58 ` [PATCH v6 09/32] refs: add do_for_each_per_worktree_ref David Turner
2016-02-24 22:58 ` [PATCH v6 10/32] refs: add methods for reflog David Turner
2016-02-24 22:58 ` [PATCH v6 11/32] refs: add method for initial ref transaction commit David Turner
2016-02-24 22:58 ` [PATCH v6 12/32] refs: add method for delete_refs David Turner
2016-02-24 22:58 ` [PATCH v6 13/32] refs: add methods to init refs db David Turner
2016-02-24 22:58 ` [PATCH v6 14/32] refs: add method to rename refs David Turner
2016-02-24 22:58 ` [PATCH v6 15/32] refs: handle non-normal ref renames David Turner
2016-02-24 22:58 ` [PATCH v6 16/32] refs: make lock generic David Turner
2016-02-24 22:58 ` [PATCH v6 17/32] refs: move duplicate check to common code David Turner
2016-02-24 22:58 ` [PATCH v6 18/32] refs: allow log-only updates David Turner
2016-02-24 22:58 ` [PATCH v6 19/32] refs: don't dereference on rename David Turner
2016-02-24 22:58 ` [PATCH v6 20/32] refs: on symref reflog expire, lock symref not referrent David Turner
2016-02-24 22:58 ` [PATCH v6 21/32] refs: resolve symbolic refs first David Turner
2016-02-24 22:58 ` [PATCH v6 22/32] refs: always handle non-normal refs in files backend David Turner
2016-02-24 22:58 ` [PATCH v6 23/32] init: allow alternate ref strorage to be set for new repos David Turner
2016-02-24 22:58 ` [PATCH v6 24/32] refs: check submodules' ref storage config David Turner
2016-02-24 22:58 ` [PATCH v6 25/32] clone: allow ref storage backend to be set for clone David Turner
2016-02-24 22:58 ` [PATCH v6 26/32] svn: learn ref-storage argument David Turner
2016-02-24 22:58 ` [PATCH v6 27/32] refs: register ref storage backends David Turner
2016-02-24 22:59 ` [PATCH v6 28/32] config: read ref storage config on startup David Turner
2016-02-27  3:56   ` Jeff King
2016-02-27  4:14     ` Jeff King
2016-02-29 21:57       ` David Turner
2016-02-29 22:13         ` Jeff King
2016-02-29 21:57     ` David Turner
2016-02-29 22:10       ` Jeff King
2016-02-29 22:21         ` Jeff King
2016-02-29 22:59           ` David Turner
2016-02-24 22:59 ` [PATCH v6 29/32] refs: break out resolve_ref_unsafe_submodule David Turner
2016-02-24 22:59 ` [PATCH v6 30/32] refs: add LMDB refs storage backend David Turner
2016-02-24 22:59 ` [PATCH v6 31/32] refs: tests for lmdb backend David Turner
2016-02-24 22:59 ` [PATCH v6 32/32] tests: add ref-storage argument David Turner
2016-02-29 22:52   ` SZEDER Gábor
2016-02-29 23:50     ` David Turner
2016-02-25  0:08 ` [PATCH v6 00/32] refs backend Ramsay Jones
2016-02-25 19:32   ` David Turner
2016-02-25 12:57 ` Duy Nguyen
2016-02-25 19:27   ` David Turner
2016-02-25 19:31     ` Stefan Beller
2016-02-25 20:31     ` Duy Nguyen

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=1456354744-8022-2-git-send-email-dturner@twopensource.com \
    --to=dturner@twopensource.com \
    --cc=git@vger.kernel.org \
    --cc=mhagger@alum.mit.edu \
    --cc=pclouds@gmail.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 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).