summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-06 12:19:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-06 12:19:04 -0700
commitd4f6b5f51ce2c974c7630b5491562a21821c8fe4 (patch)
tree59323da68719f244d7c3366bbf07ca7a80f24429
parentMerge branch 'rr/push-head' (diff)
parentarchive-zip:write_zip_entry: Remove second reset of size variable to zero. (diff)
downloadtgif-d4f6b5f51ce2c974c7630b5491562a21821c8fe4.tar.xz
Merge branch 'sb/archive-zip-double-assignment-fix'
* 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);