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 v5 21/26] refs.c: move peel_object to the common code
Date: Tue, 27 Oct 2015 22:14:22 -0400 [thread overview]
Message-ID: <1445998467-11511-22-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1445998467-11511-1-git-send-email-dturner@twopensource.com>
This function does not contain any backend specific code so we
move it to the common code.
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
refs-be-files.c | 53 -----------------------------------------------------
refs.c | 23 +++++++++++++++++++++++
refs.h | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 57 insertions(+), 53 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index fc8a0a9..23c2f78 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -1600,59 +1600,6 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
return ret;
}
-enum peel_status {
- /* object was peeled successfully: */
- PEEL_PEELED = 0,
-
- /*
- * object cannot be peeled because the named object (or an
- * object referred to by a tag in the peel chain), does not
- * exist.
- */
- PEEL_INVALID = -1,
-
- /* object cannot be peeled because it is not a tag: */
- PEEL_NON_TAG = -2,
-
- /* ref_entry contains no peeled value because it is a symref: */
- PEEL_IS_SYMREF = -3,
-
- /*
- * ref_entry cannot be peeled because it is broken (i.e., the
- * symbolic reference cannot even be resolved to an object
- * name):
- */
- PEEL_BROKEN = -4
-};
-
-/*
- * Peel the named object; i.e., if the object is a tag, resolve the
- * tag recursively until a non-tag is found. If successful, store the
- * result to sha1 and return PEEL_PEELED. If the object is not a tag
- * or is not valid, return PEEL_NON_TAG or PEEL_INVALID, respectively,
- * and leave sha1 unchanged.
- */
-static enum peel_status peel_object(const unsigned char *name, unsigned char *sha1)
-{
- struct object *o = lookup_unknown_object(name);
-
- if (o->type == OBJ_NONE) {
- int type = sha1_object_info(name, NULL);
- if (type < 0 || !object_as_type(o, type, 0))
- return PEEL_INVALID;
- }
-
- if (o->type != OBJ_TAG)
- return PEEL_NON_TAG;
-
- o = deref_tag_noverify(o);
- if (!o)
- return PEEL_INVALID;
-
- hashcpy(sha1, o->sha1);
- return PEEL_PEELED;
-}
-
/*
* Peel the entry (if possible) and return its new peel_status. If
* repeel is true, re-peel the entry even if there is an old peeled
diff --git a/refs.c b/refs.c
index c31418d..3867549 100644
--- a/refs.c
+++ b/refs.c
@@ -4,6 +4,8 @@
#include "cache.h"
#include "refs.h"
#include "lockfile.h"
+#include "object.h"
+#include "tag.h"
static int is_per_worktree_ref(const char *refname)
{
@@ -994,3 +996,24 @@ int refname_is_safe(const char *refname)
}
return 1;
}
+
+enum peel_status peel_object(const unsigned char *name, unsigned char *sha1)
+{
+ struct object *o = lookup_unknown_object(name);
+
+ if (o->type == OBJ_NONE) {
+ int type = sha1_object_info(name, NULL);
+ if (type < 0 || !object_as_type(o, type, 0))
+ return PEEL_INVALID;
+ }
+
+ if (o->type != OBJ_TAG)
+ return PEEL_NON_TAG;
+
+ o = deref_tag_noverify(o);
+ if (!o)
+ return PEEL_INVALID;
+
+ hashcpy(sha1, o->sha1);
+ return PEEL_PEELED;
+}
diff --git a/refs.h b/refs.h
index 4951141..ca60de5 100644
--- a/refs.h
+++ b/refs.h
@@ -76,6 +76,40 @@ extern int is_branch(const char *refname);
*/
extern int peel_ref(const char *refname, unsigned char *sha1);
+enum peel_status {
+ /* object was peeled successfully: */
+ PEEL_PEELED = 0,
+
+ /*
+ * object cannot be peeled because the named object (or an
+ * object referred to by a tag in the peel chain), does not
+ * exist.
+ */
+ PEEL_INVALID = -1,
+
+ /* object cannot be peeled because it is not a tag: */
+ PEEL_NON_TAG = -2,
+
+ /* ref_entry contains no peeled value because it is a symref: */
+ PEEL_IS_SYMREF = -3,
+
+ /*
+ * ref_entry cannot be peeled because it is broken (i.e., the
+ * symbolic reference cannot even be resolved to an object
+ * name):
+ */
+ PEEL_BROKEN = -4
+};
+
+/*
+ * Peel the named object; i.e., if the object is a tag, resolve the
+ * tag recursively until a non-tag is found. If successful, store the
+ * result to sha1 and return PEEL_PEELED. If the object is not a tag
+ * or is not valid, return PEEL_NON_TAG or PEEL_INVALID, respectively,
+ * and leave sha1 unchanged.
+ */
+enum peel_status peel_object(const unsigned char *name, unsigned char *sha1);
+
/**
* Resolve refname in the nested "gitlink" repository that is located
* at path. If the resolution is successful, return 0 and set sha1 to
--
2.4.2.658.g6d8523e-twtrsrc
next prev parent reply other threads:[~2015-10-28 2:16 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-28 2:14 [PATCH v5 00/26] refs backend pre-vtable David Turner
2015-10-28 2:14 ` [PATCH v5 01/26] refs.c: create a public version of verify_refname_available David Turner
2015-10-28 2:14 ` [PATCH v5 02/26] refs: make is_branch public David Turner
2015-10-28 2:14 ` [PATCH v5 03/26] refs-be-files.c: rename refs to refs-be-files David Turner
2015-10-28 2:14 ` [PATCH v5 04/26] refs.c: add a new refs.c file to hold all common refs code David Turner
2015-10-28 2:14 ` [PATCH v5 05/26] refs.c: move update_ref to refs.c David Turner
2015-10-28 2:14 ` [PATCH v5 06/26] refs.c: move delete_pseudoref and delete_ref to the common code David Turner
2015-10-28 2:14 ` [PATCH v5 07/26] refs.c: move read_ref_at to the common refs file David Turner
2015-10-28 2:14 ` [PATCH v5 08/26] refs.c: move the hidden refs functions to the common code David Turner
2015-10-28 2:14 ` [PATCH v5 09/26] refs.c: move dwim and friend functions to the common refs code David Turner
2015-10-28 2:14 ` [PATCH v5 10/26] refs.c: move warn_if_dangling_symref* to the common code David Turner
2015-10-28 2:14 ` [PATCH v5 11/26] refs.c: move read_ref, read_ref_full and ref_exists " David Turner
2015-10-28 2:14 ` [PATCH v5 12/26] refs.c: move resolve_refdup to common David Turner
2015-10-28 2:14 ` [PATCH v5 13/26] refs.c: move check_refname_format to the common code David Turner
2015-10-28 2:14 ` [PATCH v5 14/26] refs.c: move is_branch " David Turner
2015-10-28 2:14 ` [PATCH v5 15/26] refs.c: move prettify_refname " David Turner
2015-10-28 2:14 ` [PATCH v5 16/26] refs.c: move ref iterators " David Turner
2015-11-01 4:39 ` Michael Haggerty
2015-10-28 2:14 ` [PATCH v5 17/26] refs.c: move head_ref_namespaced " David Turner
2015-10-28 2:14 ` [PATCH v5 18/26] refs: move transaction functions into " David Turner
2015-11-01 8:17 ` Michael Haggerty
2015-11-02 22:19 ` David Turner
2015-10-28 2:14 ` [PATCH v5 19/26] refs.c: move refname_is_safe to the " David Turner
2015-10-28 2:14 ` [PATCH v5 20/26] refs.c: move copy_msg " David Turner
2015-10-28 2:14 ` David Turner [this message]
2015-10-28 2:14 ` [PATCH v5 22/26] refs.c: move should_autocreate_reflog to " David Turner
2015-10-28 2:14 ` [PATCH v5 23/26] initdb: move safe_create_dir into " David Turner
2015-10-28 2:14 ` [PATCH v5 24/26] refs: make files_log_ref_write functions public David Turner
2015-10-28 2:14 ` [PATCH v5 25/26] refs: break out ref conflict checks David Turner
2015-11-02 16:52 ` Michael Haggerty
2015-10-28 2:14 ` [PATCH v5 26/26] introduce "extensions" form of core.repositoryformatversion David Turner
2015-11-03 7:36 ` [PATCH v5 00/26] refs backend pre-vtable Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 00/25] " Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 01/25] refs: make is_branch public Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 02/25] refs/files-backend.c: new file, renamed from refs.c Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 03/25] refs: add a new file, refs/refs.c, to hold common refs code Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 04/25] refs: move update_ref to refs/refs.c Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 05/25] refs: move delete_pseudoref and delete_ref to the common code Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 06/25] refs: move read_ref_at to the common refs file Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 07/25] refs: move the hidden refs functions to the common code Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 08/25] refs: move dwim and friend functions to the common refs code Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 09/25] refs: move warn_if_dangling_symref* to the common code Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 10/25] refs: move read_ref, read_ref_full and ref_exists " Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 11/25] refs: move resolve_refdup to common Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 12/25] refs: move check_refname_format to the common code Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 13/25] refs: move is_branch " Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 14/25] refs: move prettify_refname " Michael Haggerty
2015-11-03 7:39 ` [PATCH v6 15/25] refs: move ref iterators " Michael Haggerty
2015-11-03 7:40 ` [PATCH v6 16/25] refs: move head_ref_namespaced " Michael Haggerty
2015-11-03 7:40 ` [PATCH v6 17/25] refs: move transaction functions " Michael Haggerty
2015-11-03 7:40 ` [PATCH v6 18/25] refs: move refname_is_safe " Michael Haggerty
2015-11-03 7:40 ` [PATCH v6 19/25] refs: move copy_msg " Michael Haggerty
2015-11-03 7:40 ` [PATCH v6 20/25] refs: move peel_object " Michael Haggerty
2015-11-03 7:40 ` [PATCH v6 21/25] refs: move should_autocreate_reflog to " Michael Haggerty
2015-11-03 7:40 ` [PATCH v6 22/25] initdb: make safe_create_dir public Michael Haggerty
2015-11-03 7:40 ` [PATCH v6 23/25] files_log_ref_write: new function Michael Haggerty
2015-11-03 7:40 ` [PATCH v6 24/25] refs: create a shared version of verify_refname_available Michael Haggerty
2015-11-03 7:40 ` [PATCH v6 25/25] refs: break out ref conflict checks Michael Haggerty
2015-11-04 21:01 ` David Turner
2015-11-05 4:00 ` Michael Haggerty
2015-11-05 16:22 ` David Turner
2015-11-06 13:34 ` Michael Haggerty
2015-11-06 17:28 ` Junio C Hamano
2015-11-06 23:24 ` Junio C Hamano
2015-11-08 5:03 ` Michael Haggerty
2015-11-08 5:54 ` Michael Haggerty
2015-11-08 18:23 ` 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=1445998467-11511-22-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).