summaryrefslogtreecommitdiff
path: root/archive-zip.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2018-03-12 02:27:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-14 16:23:48 (GMT)
commite5ec981a4b1d5a3159945f75f600bcf3764e1874 (patch)
tree35e4ffb67fff93ac61307bec9ceec7b0414fce4b /archive-zip.c
parent015ff4f8225841d791c9940d71ebbce82c978a3c (diff)
downloadgit-e5ec981a4b1d5a3159945f75f600bcf3764e1874.zip
git-e5ec981a4b1d5a3159945f75f600bcf3764e1874.tar.gz
git-e5ec981a4b1d5a3159945f75f600bcf3764e1874.tar.bz2
archive: convert sha1_file_to_archive to struct object_id
Convert this function to take a pointer to struct object_id and rename it object_file_to_archive. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'archive-zip.c')
-rw-r--r--archive-zip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/archive-zip.c b/archive-zip.c
index e2e5513..5841a6c 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -344,8 +344,8 @@ static int write_zip_entry(struct archiver_args *args,
flags |= ZIP_STREAM;
out = buffer = NULL;
} else {
- buffer = sha1_file_to_archive(args, path, oid->hash, mode,
- &type, &size);
+ buffer = object_file_to_archive(args, path, oid, mode,
+ &type, &size);
if (!buffer)
return error("cannot read %s",
oid_to_hex(oid));