Merge branch 'dp/read-not-mmap-small-loose-object' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Mar 2010 06:26:17 +0000 (22:26 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Mar 2010 06:26:17 +0000 (22:26 -0800)
commit780fc9a0a6d13f667bb012621692107d244998a8
tree7b7aed7be1531cbee13b914070694575fabee5f4
parent035aa7678b75bd6ec67f0b496603660fc685734f
parentea68b0ce9f8ce8da3e360aed3cbd6720159ffbee
Merge branch 'dp/read-not-mmap-small-loose-object' into maint

* dp/read-not-mmap-small-loose-object:
  hash-object: don't use mmap() for small files
sha1_file.c