X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=bundle.c;h=b8acf3c18b600f1f413f95744ad281e3879b3f6e;hb=f3f3c4dec6351cb875bdd24e685f2e613eb249c1;hp=08020bc3a258e055a8f5f6974217cf482edc3ee3;hpb=9b0b0b4f45bc3d2f12391fe0dd4eaef81db97295;p=git.git

diff --git a/bundle.c b/bundle.c
index 08020bc3a..b8acf3c18 100644
--- a/bundle.c
+++ b/bundle.c
@@ -31,8 +31,8 @@ static int strbuf_readline_fd(struct strbuf *sb, int fd)
 	while (1) {
 		char ch;
 		ssize_t len = xread(fd, &ch, 1);
-		if (len < 0)
-			return -1;
+		if (len <= 0)
+			return len;
 		strbuf_addch(sb, ch);
 		if (ch == '\n')
 			break;
@@ -320,7 +320,7 @@ int create_bundle(struct bundle_header *header, const char *path,
 			continue;
 		if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
 			continue;
-		if (!resolve_ref(e->name, sha1, 1, &flag))
+		if (read_ref_full(e->name, sha1, 1, &flag))
 			flag = 0;
 		display_ref = (flag & REF_ISSYMREF) ? e->name : ref;