Skip to content

Commit

Permalink
add_info_ref(): rewrite to take an object_id argument
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mhagger authored and gitster committed May 25, 2015
1 parent a89caf4 commit e2b0bcd
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions server-info.c
Expand Up @@ -47,14 +47,15 @@ static int update_info_file(char *path, int (*generate)(FILE *))
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) {
Expand All @@ -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)
Expand Down

0 comments on commit e2b0bcd

Please sign in to comment.