aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-19 10:40:53 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-19 10:40:53 -0700
commit509152d3fa543bd3e030825ecefda298bbc4dfa7 (patch)
tree5c15b997d21c13961ed5c410a37d8f38cae89d78
parent6741edcc501288e0b1bff0773e39c0844d083af8 (diff)
parentbe706c6f4f99ec04c4104bda8820513276af8129 (diff)
downloadgit-509152d3fa543bd3e030825ecefda298bbc4dfa7.tar.gz
git-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 b2c4fe0e9..4bde019bc 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);