X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=server-info.c;h=0eb5132cc1cf09ea7dacdf659d3c03adae761acf;hp=6089765941f36712ec6ee54e5b1492b8c707917b;hb=HEAD;hpb=21b1aced83195af50fd8bc9a88e7734c8ee77c0e

diff --git a/server-info.c b/server-info.c
index 60897659..0eb5132c 100644
--- a/server-info.c
+++ b/server-info.c
@@ -12,7 +12,7 @@ static int add_info_ref(const char *path, const unsigned char *sha1)
 	struct object *o = parse_object(sha1);
 
 	fprintf(info_ref_fp, "%s	%s\n", sha1_to_hex(sha1), path);
-	if (o->type == tag_type) {
+	if (o->type == TYPE_TAG) {
 		o = deref_tag(o, path, 0);
 		if (o)
 			fprintf(info_ref_fp, "%s	%s^{}\n",
@@ -99,7 +99,10 @@ static int read_pack_info_file(const char *infofile)
 	while (fgets(line, sizeof(line), fp)) {
 		int len = strlen(line);
 		if (line[len-1] == '\n')
-			line[len-1] = 0;
+			line[--len] = 0;
+
+		if (!len)
+			continue;
 
 		switch (line[0]) {
 		case 'P': /* P name */