diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2015-05-25 18:39:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-25 19:19:35 (GMT) |
| commit | e2b0bcdf4a1106342dd443b7f86aef63bbe54897 (patch) | |
| tree | 7dcd2e2b28932faf3b4482f86f371963b5085f2b /server-info.c | |
| parent | a89caf4bd41eff7e144831d48f0ed18a1e4e7630 (diff) | |
| download | git-e2b0bcdf4a1106342dd443b7f86aef63bbe54897.zip git-e2b0bcdf4a1106342dd443b7f86aef63bbe54897.tar.gz git-e2b0bcdf4a1106342dd443b7f86aef63bbe54897.tar.bz2 | |
add_info_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 'server-info.c')
| -rw-r--r-- | server-info.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/server-info.c b/server-info.c index 317dda8..c82e9ee 100644 --- a/server-info.c +++ b/server-info.c @@ -47,14 +47,15 @@ out: return ret; } -static int add_info_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data) +static int add_info_ref(const char *path, const struct object_id *oid, + int flag, void *cb_data) { FILE *fp = cb_data; - struct object *o = parse_object(sha1); + struct object *o = parse_object(oid->hash); if (!o) return -1; - if (fprintf(fp, "%s %s\n", sha1_to_hex(sha1), path) < 0) + if (fprintf(fp, "%s %s\n", oid_to_hex(oid), path) < 0) return -1; if (o->type == OBJ_TAG) { @@ -69,10 +70,7 @@ static int add_info_ref(const char *path, const unsigned char *sha1, int flag, v static int generate_info_refs(FILE *fp) { - struct each_ref_fn_sha1_adapter wrapped_add_info_ref = - {add_info_ref, fp}; - - return for_each_ref(each_ref_fn_adapter, &wrapped_add_info_ref); + return for_each_ref(add_info_ref, fp); } static int update_info_refs(int force) |