apply: get rid of --index-info in favor of --build-fake-ancestor

diff --git a/server-info.c b/server-info.c
index 6cd38be3291e95e75a7d2348e825d49c8f7ad2af..0d1312ca56d52daa3fc692984d4d3abaf3425791 100644 (file)
--- a/server-info.c
+++ b/server-info.c
@@ -10,6 +10,8 @@ static FILE *info_ref_fp;
 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) {
@@ -36,6 +38,7 @@ static int update_info_refs(int force)
                return error("unable to update %s", path0);
        for_each_ref(add_info_ref, NULL);
        fclose(info_ref_fp);
+       adjust_shared_perm(path1);
        rename(path1, path0);
        free(path0);
        free(path1);
@@ -225,6 +228,7 @@ static int update_info_packs(int force)
                return error("cannot open %s", name);
        write_pack_info_file(fp);
        fclose(fp);
+       adjust_shared_perm(name);
        rename(name, infofile);
        return 0;
 }