Merge branch 'jc/streaming' into next
commit7fdda8d4928987592d32515ec060213c236c6f7b
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 18:40:40 +0000 (26 11:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 18:40:40 +0000 (26 11:40 -0700)
tree2e5ca121008a3dbcc027080f19699b46f55bb6ec
parent9f46ca0aec6956294992cda67b91c2fc82a8efa6
parent23c7df6bdd13e3d99ca09b6a7655747cc29ccc41
Merge branch 'jc/streaming' into next

* jc/streaming:
  sha1_file: use the correct type (ssize_t, not size_t) for read-style function