Merge branch 'maint-1.6.1' into maint
commitb0de55541024a39ece47cf7a1eebdbde08ba978f
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Mar 2009 22:31:21 +0000 (24 15:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Mar 2009 22:31:21 +0000 (24 15:31 -0700)
tree5b652d49aaab85a7571aa41978f39dc80c1a6b48
parentcbc8c6104199ffa63b61f4e8dee32d3a713e2939
parent2a5643da732b70004920f75efa1ebdc2a6ed1689
Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  close_sha1_file(): make it easier to diagnose errors
  avoid possible overflow in delta size filtering computation
builtin-pack-objects.c
sha1_file.c