Merge branch 'maint-1.6.0' into maint
commit8561b522d756861a41c0c54dfa2f609c7063887a
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Jan 2009 07:41:28 +0000 (28 23:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Jan 2009 07:41:28 +0000 (28 23:41 -0800)
tree1a4f54e998139a48edff314339c486779aefb31b
parent02322e1619dc537dc48650761f6c9bae883612a7
parent915308b187bdaba9ad1c6c3dea7b2b4b200b4796
Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  avoid 31-bit truncation in write_loose_object
sha1_file.c