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)
commitb76c561a74cd366786b7b762795fba1551b42149
treefc62c2f0ec076276a5b949a520eb8576e94e4026
parentafd6284a7fdbb479b5c99a87f64d7496f6fe8a27
parent2727b71f0547f5181653940d279854e7924788fb
Merge branch 'jc/unseekable-bundle'

* 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