summaryrefslogtreecommitdiff
path: root/builtin/for-each-ref.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-05-25 18:38:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-25 19:19:29 (GMT)
commit30a3fd40500c31a74ebab808d741d2fc6c449a29 (patch)
tree1554f86ff24bcebd0345cf45ac60dd72282f0c40 /builtin/for-each-ref.c
parent0e0b7de4c78427deeb58860519e6a93d4b52e3cd (diff)
downloadgit-30a3fd40500c31a74ebab808d741d2fc6c449a29.zip
git-30a3fd40500c31a74ebab808d741d2fc6c449a29.tar.gz
git-30a3fd40500c31a74ebab808d741d2fc6c449a29.tar.bz2
grab_single_ref(): rewrite to take an object_id argument
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/for-each-ref.c')
-rw-r--r--builtin/for-each-ref.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index caccd93..05ce28c 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -840,7 +840,8 @@ struct grab_ref_cbdata {
* A call-back given to for_each_ref(). Filter refs and keep them for
* later object processing.
*/
-static int grab_single_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
+static int grab_single_ref(const char *refname, const struct object_id *oid,
+ int flag, void *cb_data)
{
struct grab_ref_cbdata *cb = cb_data;
struct refinfo *ref;
@@ -878,7 +879,7 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f
*/
ref = xcalloc(1, sizeof(*ref));
ref->refname = xstrdup(refname);
- hashcpy(ref->objectname, sha1);
+ hashcpy(ref->objectname, oid->hash);
ref->flag = flag;
cnt = cb->grab_cnt;
@@ -1072,8 +1073,6 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
int maxcount = 0, quote_style = 0;
struct refinfo **refs;
struct grab_ref_cbdata cbdata;
- struct each_ref_fn_sha1_adapter wrapped_grab_single_ref =
- {grab_single_ref, &cbdata};
struct option opts[] = {
OPT_BIT('s', "shell", &quote_style,
@@ -1113,7 +1112,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
memset(&cbdata, 0, sizeof(cbdata));
cbdata.grab_pattern = argv;
- for_each_rawref(each_ref_fn_adapter, &wrapped_grab_single_ref);
+ for_each_rawref(grab_single_ref, &cbdata);
refs = cbdata.grab_array;
num_refs = cbdata.grab_cnt;