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
This commit is contained in:
Junio C Hamano
2012-01-03 13:48:00 -08:00
5 changed files with 19 additions and 8 deletions

View File

@ -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;