X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=server-info.c;h=6cd38be3291e95e75a7d2348e825d49c8f7ad2af;hb=60c0f8462fefed22fc8fb9c4e529665ed8204536;hp=fdfe05a2daeeb9253b6fb6a15518aba967821cb2;hpb=12d4a97a03ebb4dc64ee995fe33f29076ffa9b39;p=git.git diff --git a/server-info.c b/server-info.c index fdfe05a2d..6cd38be32 100644 --- a/server-info.c +++ b/server-info.c @@ -7,12 +7,12 @@ /* refs */ static FILE *info_ref_fp; -static int add_info_ref(const char *path, const unsigned char *sha1) +static int add_info_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data) { struct object *o = parse_object(sha1); fprintf(info_ref_fp, "%s %s\n", sha1_to_hex(sha1), path); - if (o->type == TYPE_TAG) { + if (o->type == OBJ_TAG) { o = deref_tag(o, path, 0); if (o) fprintf(info_ref_fp, "%s %s^{}\n", @@ -23,7 +23,7 @@ static int add_info_ref(const char *path, const unsigned char *sha1) static int update_info_refs(int force) { - char *path0 = strdup(git_path("info/refs")); + char *path0 = xstrdup(git_path("info/refs")); int len = strlen(path0); char *path1 = xmalloc(len + 2); @@ -34,7 +34,7 @@ static int update_info_refs(int force) info_ref_fp = fopen(path1, "w"); if (!info_ref_fp) return error("unable to update %s", path0); - for_each_ref(add_info_ref); + for_each_ref(add_info_ref, NULL); fclose(info_ref_fp); rename(path1, path0); free(path0);