author | Junio C Hamano <gitster@pobox.com> | |
Fri, 6 Feb 2009 02:01:00 +0000 (18:01 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 6 Feb 2009 02:01:00 +0000 (18:01 -0800) | ||
commit | 141b6b83d7ca5bd32d55a0a7e08384084d081557 | |
tree | 5c0aea567c793844ba1568c77b3eb3bea2e6fe81 | tree | snapshot |
parent | cc91e1bd0537442339c4fd233b98a4b30e9dbe29 | commit | diff |
parent | 39c68542fc8d8477f2080c99efedb9dce975abc6 | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
builtin-pack-objects.c | diff1 | | diff2 | | blob | history |
builtin-unpack-objects.c | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
http-push.c | diff1 | | diff2 | | blob | history |
http-walker.c | diff1 | | diff2 | | blob | history |
index-pack.c | diff1 | | diff2 | | blob | history |
sha1_file.c | diff1 | | diff2 | | blob | history |