[PATCH v4 11/26] refs.c: move read_ref, read_ref_full and ref_exists to the common code
From: David Turner <hidden>
Date: 2016-06-15 23:06:53
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Ronnie Sahlberg <redacted> These functions do not depend on the backend implementation so we move them to the common code. Signed-off-by: Ronnie Sahlberg <redacted> Signed-off-by: David Turner <redacted> Signed-off-by: Junio C Hamano <redacted> --- refs-be-files.c | 18 ------------------ refs.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 9c53f54..728751a 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c@@ -1791,24 +1791,6 @@ struct ref_filter { void *cb_data; }; -int read_ref_full(const char *refname, int resolve_flags, unsigned char *sha1, int *flags) -{ - if (resolve_ref_unsafe(refname, resolve_flags, sha1, flags)) - return 0; - return -1; -} - -int read_ref(const char *refname, unsigned char *sha1) -{ - return read_ref_full(refname, RESOLVE_REF_READING, sha1, NULL); -} - -int ref_exists(const char *refname) -{ - unsigned char sha1[20]; - return !!resolve_ref_unsafe(refname, RESOLVE_REF_READING, sha1, NULL); -} - static int filter_refs(const char *refname, const struct object_id *oid, int flags, void *data) {
diff --git a/refs.c b/refs.c
index fab7603..8a619a6 100644
--- a/refs.c
+++ b/refs.c@@ -598,3 +598,21 @@ void warn_dangling_symrefs(FILE *fp, const char *msg_fmt, const struct string_li data.msg_fmt = msg_fmt; for_each_rawref(warn_if_dangling_symref, &data); } + +int read_ref_full(const char *refname, int resolve_flags, unsigned char *sha1, int *flags) +{ + if (resolve_ref_unsafe(refname, resolve_flags, sha1, flags)) + return 0; + return -1; +} + +int read_ref(const char *refname, unsigned char *sha1) +{ + return read_ref_full(refname, RESOLVE_REF_READING, sha1, NULL); +} + +int ref_exists(const char *refname) +{ + unsigned char sha1[20]; + return !!resolve_ref_unsafe(refname, RESOLVE_REF_READING, sha1, NULL); +}
--
2.4.2.644.g97b850b-twtrsrc