Merge branch 'rs/zip-compresssed-size-with-export-subst' into next
commit3d2ff8856fae64f9f7f8d1bf8d2866c82cce7b2b
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 22:57:08 +0000 (19 15:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 22:57:08 +0000 (19 15:57 -0700)
tree8993726e4dd4f14c1eb3d603afd32ce52b0e8359
parent2daad635832dd7514897f4a565e8d904a78e7a4f
parentd3c1472fe35e2575508d80415565822ee2211df5
Merge branch 'rs/zip-compresssed-size-with-export-subst' into next

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