Merge branch 'jc/unseekable-bundle' into next
commit2978ee0fa3ab5378abc0510bb475aed5b51d3ca9
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 18:09:34 +0000 (19 11:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 18:09:34 +0000 (19 11:09 -0700)
treec5952284fcb83e0a5095974affccc82f4da1c1ae
parent7015e53c8f73ec91c619ea38624b69c10512295f
parent2727b71f0547f5181653940d279854e7924788fb
Merge branch 'jc/unseekable-bundle' into next

* jc/unseekable-bundle:
  bundle: add parse_bundle_header() helper function
  bundle: allowing to read from an unseekable fd

Conflicts:
transport.c
bundle.c
bundle.h
transport.c