Merge branch 'np/pack'

diff --git a/server-info.c b/server-info.c
index 2fb8f571033918b870cde35979b377c98b9845b5..f9be5a7f60c1cc5208e7c91367ecb28014106f18 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -7,9 +7,11 @@
 /* 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);
+       if (!o)
+               return -1;
 
        fprintf(info_ref_fp, "%s        %s\n", sha1_to_hex(sha1), path);
        if (o->type == OBJ_TAG) {
@@ -34,7 +36,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);