Merge branch 'sb/archive-zip-double-assignment-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Jun 2013 19:19:04 +0000 (12:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Jun 2013 19:19:04 +0000 (12:19 -0700)
* sb/archive-zip-double-assignment-fix:
archive-zip:write_zip_entry: Remove second reset of size variable to zero.

archive-zip.c
index b2c4fe0e9f9816a6cb79aa8f7a0cb59ae5bf7f8d..4bde019bce632703d4e336d6404693487cdbcdfb 100644 (file)
@@ -232,7 +232,6 @@ static int write_zip_entry(struct archiver_args *args,
                size = 0;
                compressed_size = 0;
                buffer = NULL;
-               size = 0;
        } else if (S_ISREG(mode) || S_ISLNK(mode)) {
                enum object_type type = sha1_object_info(sha1, &size);