From: Ronnie Sahlberg <[email protected]>
Signed-off-by: Ronnie Sahlberg <[email protected]>
Signed-off-by: David Turner <[email protected]>
---
refs-be-files.c | 41 ++++++++++++++++++++++++----------
refs.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++-----------
refs.h | 34 +++++++++++++++++++++++++---
3 files changed, 116 insertions(+), 28 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 116d72d..2e2399e 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -1862,32 +1862,36 @@ static int do_head_ref(const char *submodule,
each_ref_fn fn, void *cb_data)
return 0;
}
-int head_ref(each_ref_fn fn, void *cb_data)
+static int files_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)
+static int files_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)
+static int files_for_each_ref(each_ref_fn fn, void *cb_data)
{
return do_for_each_ref(&ref_cache, "", fn, 0, 0, cb_data);
}
-int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void
*cb_data)
+static int files_for_each_ref_submodule(const char *submodule, each_ref_fn fn,
+ void *cb_data)
{
return do_for_each_ref(get_ref_cache(submodule), "", fn, 0, 0, cb_data);
}
-int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
+static int files_for_each_ref_in(const char *prefix, each_ref_fn fn,
+ void *cb_data)
{
return do_for_each_ref(&ref_cache, prefix, fn, strlen(prefix), 0,
cb_data);
}
-int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
unsigned int broken)
+static int files_for_each_fullref_in(const char *prefix, each_ref_fn fn,
+ void *cb_data, unsigned int broken)
{
unsigned int flag = 0;
@@ -1896,18 +1900,21 @@ int for_each_fullref_in(const char *prefix, each_ref_fn
fn, void *cb_data, unsig
return do_for_each_ref(&ref_cache, prefix, fn, 0, flag, cb_data);
}
-int for_each_ref_in_submodule(const char *submodule, const char *prefix,
- each_ref_fn fn, void *cb_data)
+static int files_for_each_ref_in_submodule(const char *submodule,
+ const char *prefix,
+ each_ref_fn fn, void *cb_data)
{
- return do_for_each_ref(get_ref_cache(submodule), prefix, fn,
strlen(prefix), 0, cb_data);
+ return do_for_each_ref(get_ref_cache(submodule), prefix, fn,
+ strlen(prefix), 0, cb_data);
}
-int for_each_replace_ref(each_ref_fn fn, void *cb_data)
+
+static int files_for_each_replace_ref(each_ref_fn fn, void *cb_data)
{
return do_for_each_ref(&ref_cache, git_replace_ref_base, fn,
strlen(git_replace_ref_base), 0, cb_data);
}
-int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
+static int files_for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
{
struct strbuf buf = STRBUF_INIT;
int ret;
@@ -1917,7 +1924,7 @@ int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
return ret;
}
-int for_each_rawref(each_ref_fn fn, void *cb_data)
+static int files_for_each_rawref(each_ref_fn fn, void *cb_data)
{
return do_for_each_ref(&ref_cache, "", fn, 0,
DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
@@ -3635,4 +3642,14 @@ struct ref_be refs_be_files = {
files_peel_ref,
files_create_symref,
files_resolve_gitlink_ref,
+ files_head_ref,
+ files_head_ref_submodule,
+ files_for_each_ref,
+ files_for_each_ref_submodule,
+ files_for_each_ref_in,
+ files_for_each_fullref_in,
+ files_for_each_ref_in_submodule,
+ files_for_each_rawref,
+ files_for_each_namespaced_ref,
+ files_for_each_replace_ref,
};
diff --git a/refs.c b/refs.c
index 61d90f5..657ab73 100644
--- a/refs.c
+++ b/refs.c
@@ -1042,19 +1042,8 @@ int peel_ref(const char *refname, unsigned char *sha1)
int create_symref(const char *ref_target, const char *refs_heads_master,
const char *logmsg)
{
- struct strbuf err = STRBUF_INIT;
- struct ref_transaction *transaction = ref_transaction_begin(&err);
- if (!transaction)
- return -1;
-
- if (the_refs_backend->create_symref(transaction, ref_target,
- refs_heads_master, logmsg))
- return -1;
-
- if (ref_transaction_commit(transaction, &err))
- return -1;
-
- return 0;
+ return the_refs_backend->create_symref(ref_target, refs_heads_master,
+ logmsg);
}
int resolve_gitlink_ref(const char *path, const char *refname,
@@ -1062,3 +1051,57 @@ int resolve_gitlink_ref(const char *path, const char
*refname,
{
return the_refs_backend->resolve_gitlink_ref(path, refname, sha1);
}
+
+int head_ref(each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->head_ref(fn, cb_data);
+}
+
+int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->head_ref_submodule(submodule, fn, cb_data);
+}
+
+int for_each_ref(each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_ref(fn, cb_data);
+}
+
+int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void
*cb_data)
+{
+ return the_refs_backend->for_each_ref_submodule(submodule, fn, cb_data);
+}
+
+int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_ref_in(prefix, fn, cb_data);
+}
+
+int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
+ unsigned int broken)
+{
+ return the_refs_backend->for_each_fullref_in(prefix, fn, cb_data,
+ broken);
+}
+
+int for_each_ref_in_submodule(const char *submodule, const char *prefix,
+ each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_ref_in_submodule(submodule, prefix,
+ fn, cb_data);
+}
+
+int for_each_rawref(each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_rawref(fn, cb_data);
+}
+
+int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_namespaced_ref(fn, cb_data);
+}
+
+int for_each_replace_ref(each_ref_fn fn, void *cb_data)
+{
+ return the_refs_backend->for_each_replace_ref(fn, cb_data);
+}
diff --git a/refs.h b/refs.h
index ee06a20..6dec0da 100644
--- a/refs.h
+++ b/refs.h
@@ -626,15 +626,33 @@ typedef void ref_transaction_free_fn(struct
ref_transaction *transaction);
typedef const char *resolve_ref_unsafe_fn(const char *ref,
int resolve_flags,
unsigned char *sha1, int *flags);
-typedef int verify_refname_available_fn(const char *refname, struct
string_list *extra, struct string_list *skip, struct strbuf *err);
+typedef int verify_refname_available_fn(const char *refname,
+ struct string_list *extra,
+ struct string_list *skip,
+ struct strbuf *err);
typedef int pack_refs_fn(unsigned int flags);
typedef int peel_ref_fn(const char *refname, unsigned char *sha1);
-typedef int create_symref_fn(struct ref_transaction *transaction,
- const char *ref_target,
+typedef int create_symref_fn(const char *ref_target,
const char *refs_heads_master,
const char *logmsg);
typedef int resolve_gitlink_ref_fn(const char *path, const char *refname,
unsigned char *sha1);
+typedef int head_ref_fn(each_ref_fn fn, void *cb_data);
+typedef int head_ref_submodule_fn(const char *submodule, each_ref_fn fn,
+ void *cb_data);
+typedef int for_each_ref_fn(each_ref_fn fn, void *cb_data);
+typedef int for_each_ref_submodule_fn(const char *submodule, each_ref_fn fn,
+ void *cb_data);
+typedef int for_each_ref_in_fn(const char *prefix, each_ref_fn fn,
+ void *cb_data);
+typedef int for_each_fullref_in_fn(const char *prefix, each_ref_fn fn,
+ void *cb_data, unsigned int broken);
+typedef int for_each_ref_in_submodule_fn(const char *submodule,
+ const char *prefix,
+ each_ref_fn fn, void *cb_data);
+typedef int for_each_rawref_fn(each_ref_fn fn, void *cb_data);
+typedef int for_each_namespaced_ref_fn(each_ref_fn fn, void *cb_data);
+typedef int for_each_replace_ref_fn(each_ref_fn fn, void *cb_data);
struct ref_be {
struct ref_be *next;
@@ -646,6 +664,16 @@ struct ref_be {
peel_ref_fn *peel_ref;
create_symref_fn *create_symref;
resolve_gitlink_ref_fn *resolve_gitlink_ref;
+ head_ref_fn *head_ref;
+ head_ref_submodule_fn *head_ref_submodule;
+ for_each_ref_fn *for_each_ref;
+ for_each_ref_submodule_fn *for_each_ref_submodule;
+ for_each_ref_in_fn *for_each_ref_in;
+ for_each_fullref_in_fn *for_each_fullref_in;
+ for_each_ref_in_submodule_fn *for_each_ref_in_submodule;
+ for_each_rawref_fn *for_each_rawref;
+ for_each_namespaced_ref_fn *for_each_namespaced_ref;
+ for_each_replace_ref_fn *for_each_replace_ref;
};
--
2.4.2.644.g97b850b-twtrsrc
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
