summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-19 10:40:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-19 10:40:53 -0700
commit509152d3fa543bd3e030825ecefda298bbc4dfa7 (patch)
tree5c15b997d21c13961ed5c410a37d8f38cae89d78
parentMerge branch 'th/bisect-skip-report-range-fix' into maint (diff)
parentarchive-zip:write_zip_entry: Remove second reset of size variable to zero. (diff)
downloadtgif-509152d3fa543bd3e030825ecefda298bbc4dfa7.tar.xz
Merge branch 'sb/archive-zip-double-assignment-fix' into maint
* sb/archive-zip-double-assignment-fix: archive-zip:write_zip_entry: Remove second reset of size variable to zero.
-rw-r--r--archive-zip.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/archive-zip.c b/archive-zip.c
index b2c4fe0e9f..4bde019bce 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -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);