Merge branch 'lt/maint-wrap-zlib' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 02:01:00 +0000 (18:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 02:01:00 +0000 (18:01 -0800)
commit141b6b83d7ca5bd32d55a0a7e08384084d081557
tree5c0aea567c793844ba1568c77b3eb3bea2e6fe81
parentcc91e1bd0537442339c4fd233b98a4b30e9dbe29
parent39c68542fc8d8477f2080c99efedb9dce975abc6
Merge branch 'lt/maint-wrap-zlib' into maint

* lt/maint-wrap-zlib:
  Wrap inflate and other zlib routines for better error reporting

Conflicts:
http-push.c
http-walker.c
sha1_file.c
builtin-apply.c
builtin-pack-objects.c
builtin-unpack-objects.c
cache.h
http-push.c
http-walker.c
index-pack.c
sha1_file.c