Merge branch 'jc/unseekable-bundle'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)
* jc/unseekable-bundle:
  bundle: add parse_bundle_header() helper function
  bundle: allowing to read from an unseekable fd

Conflicts:
transport.c

1  2 
bundle.c
bundle.h
transport.c

diff --cc bundle.c
Simple merge
diff --cc bundle.h
Simple merge
diff --cc transport.c
Simple merge