Merge branch 'rs/zip-compresssed-size-with-export-subst' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Mar 2013 19:43:49 +0000 (12:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Mar 2013 19:43:49 +0000 (12:43 -0700)
commit7d2726c3933538e5f256846a2bb38e1065c868b5
treec1e2be1bc8c7cfb4c464637c7dc5f5e8986eb9e5
parentd7cccbb3bb706b6a9eb13120e354a8487b4b3cfe
parentd3c1472fe35e2575508d80415565822ee2211df5
Merge branch 'rs/zip-compresssed-size-with-export-subst' into maint

When export-subst is used, "zip" output recorded incorrect
size of the file.

* rs/zip-compresssed-size-with-export-subst:
  archive-zip: fix compressed size for stored export-subst files