From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Jan 2012 21:48:00 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.9-rc0~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/228c3418356d06d0596408bee1c863e53ca27d58?hp=-c

Merge branch 'maint'

* maint:
docs: describe behavior of relative submodule URLs
fix hang in git fetch if pointed at a 0 length bundle
Documentation: read-tree --prefix works with existing subtrees
Add MYMETA.json to perl/.gitignore
---

228c3418356d06d0596408bee1c863e53ca27d58
diff --combined bundle.c
index 4742f2734e,8a1d53ba29..b8acf3c18b
--- a/bundle.c
+++ b/bundle.c
@@@ -31,8 -31,8 +31,8 @@@ static int strbuf_readline_fd(struct st
  	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 +320,7 @@@ int create_bundle(struct bundle_header 
  			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;