From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: Andreas Schwab <schwab@linux-m68k.org>,
"Kyle J. McKay" <mackyle@gmail.com>,
Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Johannes Sixt <j6t@kdbg.org>, David Kastrup <dak@gnu.org>,
James Denholm <nod.helm@gmail.com>
Subject: [PATCH 06/16] refs: convert for_each_ref_submodule to struct object_id
Date: Fri, 20 Mar 2015 19:28:26 +0000 [thread overview]
Message-ID: <1426879716-47835-7-git-send-email-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <1426879716-47835-1-git-send-email-sandals@crustytoothpaste.net>
Convert the callers as well.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
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
next prev parent reply other threads:[~2015-03-20 19:29 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-20 19:28 [PATCH 00/16] Convert parts of refs.c to struct object_id brian m. carlson
2015-03-20 19:28 ` [PATCH 01/16] refs: convert struct ref_entry to use " brian m. carlson
2015-03-20 19:28 ` [PATCH 02/16] refs: convert for_each_tag_ref to " brian m. carlson
2015-03-20 19:28 ` [PATCH 03/16] refs: convert remaining users of for_each_ref_in to object_id brian m. carlson
2015-03-20 19:28 ` [PATCH 04/16] refs: convert for_each_ref_in_submodule " brian m. carlson
2015-03-20 19:28 ` [PATCH 05/16] refs: convert head_ref to struct object_id brian m. carlson
2015-03-20 19:28 ` brian m. carlson [this message]
2015-03-20 19:28 ` [PATCH 07/16] revision: remove unused _oid helper brian m. carlson
2015-03-20 19:28 ` [PATCH 08/16] refs: convert for_each_ref to struct object_id brian m. carlson
2015-03-20 19:28 ` [PATCH 09/16] refs: convert for_each_replace_ref " brian m. carlson
2015-03-20 19:28 ` [PATCH 10/16] refs: convert namespaced ref iteration functions to object_id brian m. carlson
2015-03-20 19:28 ` [PATCH 11/16] refs: convert for_each_rawref to struct object_id brian m. carlson
2015-03-20 19:28 ` [PATCH 12/16] refs: rename do_for_each_ref_oid to do_for_each_ref brian m. carlson
2015-03-20 19:28 ` [PATCH 13/16] refs: convert for_each_reflog to struct object_id brian m. carlson
2015-03-20 19:28 ` [PATCH 14/16] refs: rename each_ref_fn_oid to each_ref_fn brian m. carlson
2015-03-20 19:28 ` [PATCH 15/16] Remove unneeded *_oid functions brian m. carlson
2015-03-20 19:28 ` [PATCH 16/16] refs: convert struct ref_lock to struct object_id brian m. carlson
2015-03-20 19:52 ` [PATCH 00/16] Convert parts of refs.c " Junio C Hamano
2015-03-20 19:55 ` brian m. carlson
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=1426879716-47835-7-git-send-email-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=dak@gnu.org \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=mackyle@gmail.com \
--cc=nod.helm@gmail.com \
--cc=pclouds@gmail.com \
--cc=schwab@linux-m68k.org \
/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).