Merge branch 'maint-1.6.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Mar 2009 22:31:21 +0000 (15:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Mar 2009 22:31:21 +0000 (15:31 -0700)
* maint-1.6.1:
  close_sha1_file(): make it easier to diagnose errors
  avoid possible overflow in delta size filtering computation

1  2 
builtin-pack-objects.c
sha1_file.c

Simple merge
diff --cc sha1_file.c
Simple merge