X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=server-info.c;h=c1c073b2f05a48772a45602cdc711eef6e211695;hb=e0e03a731b2d06f42e79a2ff156ef9bd0e5c6c02;hp=2fb8f571033918b870cde35979b377c98b9845b5;hpb=3453f862e1c74e400da67def9b810300ef90c3ac;p=git.git

diff --git a/server-info.c b/server-info.c
index 2fb8f5710..c1c073b2f 100644
--- 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) {
@@ -33,9 +35,10 @@ static int update_info_refs(int force)
 	safe_create_leading_directories(path0);
 	info_ref_fp = fopen(path1, "w");
 	if (!info_ref_fp)
-		return error("unable to update %s", path0);
-	for_each_ref(add_info_ref);
+		return error("unable to update %s", path1);
+	for_each_ref(add_info_ref, NULL);
 	fclose(info_ref_fp);
+	adjust_shared_perm(path1);
 	rename(path1, path0);
 	free(path0);
 	free(path1);
@@ -98,7 +101,7 @@ static int read_pack_info_file(const char *infofile)
 
 	while (fgets(line, sizeof(line), fp)) {
 		int len = strlen(line);
-		if (line[len-1] == '\n')
+		if (len && line[len-1] == '\n')
 			line[--len] = 0;
 
 		if (!len)
@@ -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;
 }