[PATCH 06/16] refs: convert for_each_ref_submodule to struct object_id
From: brian m. carlson <hidden>
Date: 2016-06-15 23:04:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
Convert the callers as well. Signed-off-by: brian m. carlson <redacted> --- refs.c | 4 ++-- refs.h | 2 +- revision.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/refs.c b/refs.c
index 75d8970..758bdd9 100644
--- a/refs.c
+++ b/refs.c@@ -1964,9 +1964,9 @@ int 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) +int for_each_ref_submodule(const char *submodule, each_ref_fn_oid fn, void *cb_data) { - return do_for_each_ref(get_ref_cache(submodule), "", fn, 0, 0, cb_data); + return do_for_each_ref_oid(get_ref_cache(submodule), "", fn, 0, 0, cb_data); } int for_each_ref_in(const char *prefix, each_ref_fn_oid fn, void *cb_data)
diff --git a/refs.h b/refs.h
index 6c4a8c0..d3ff0b1 100644
--- a/refs.h
+++ b/refs.h@@ -106,7 +106,7 @@ extern int for_each_glob_ref(each_ref_fn, const char *pattern, void *); extern int for_each_glob_ref_in(each_ref_fn, const char *pattern, const char* prefix, void *); extern int head_ref_submodule(const char *submodule, each_ref_fn_oid fn, void *cb_data); -extern int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data); +extern int for_each_ref_submodule(const char *submodule, each_ref_fn_oid fn, void *cb_data); extern int for_each_ref_in_submodule(const char *submodule, const char *prefix, each_ref_fn_oid fn, void *cb_data); extern int for_each_tag_ref_submodule(const char *submodule, each_ref_fn_oid fn, void *cb_data);
diff --git a/revision.c b/revision.c
index 7b05c89..c2d8b1c 100644
--- a/revision.c
+++ b/revision.c@@ -2099,7 +2099,7 @@ static int handle_revision_pseudo_opt(const char *submodule, * register it in the list at the top of handle_revision_opt. */ if (!strcmp(arg, "--all")) { - handle_refs(submodule, revs, *flags, for_each_ref_submodule); + handle_refs_oid(submodule, revs, *flags, for_each_ref_submodule); handle_refs_oid(submodule, revs, *flags, head_ref_submodule); clear_ref_exclusion(&revs->ref_excludes); } else if (!strcmp(arg, "--branches")) {
--
2.2.1.209.g41e5f3a