]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rs/deflate-init-cleanup' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2015 18:23:37 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2015 18:23:38 +0000 (11:23 -0700)
Code simplification.

* rs/deflate-init-cleanup:
  zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}

1  2 
builtin/index-pack.c
builtin/pack-objects.c
bulk-checkin.c
diff.c
fast-import.c
http-push.c
remote-curl.c
sha1_file.c

Simple merge
Simple merge
diff --cc bulk-checkin.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc fast-import.c
Simple merge
diff --cc http-push.c
Simple merge
diff --cc remote-curl.c
Simple merge
diff --cc sha1_file.c
Simple merge