diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:36 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 09:23:48 -0700 |
commit | e5ec981a4b1d5a3159945f75f600bcf3764e1874 (patch) | |
tree | 35e4ffb67fff93ac61307bec9ceec7b0414fce4b /archive.c | |
parent | archive: convert write_archive_entry_fn_t to object_id (diff) | |
download | tgif-e5ec981a4b1d5a3159945f75f600bcf3764e1874.tar.xz |
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.c')
-rw-r--r-- | archive.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -63,16 +63,16 @@ static void format_subst(const struct commit *commit, free(to_free); } -void *sha1_file_to_archive(const struct archiver_args *args, - const char *path, const unsigned char *sha1, - unsigned int mode, enum object_type *type, - unsigned long *sizep) +void *object_file_to_archive(const struct archiver_args *args, + const char *path, const struct object_id *oid, + unsigned int mode, enum object_type *type, + unsigned long *sizep) { void *buffer; const struct commit *commit = args->convert ? args->commit : NULL; path += args->baselen; - buffer = read_sha1_file(sha1, type, sizep); + buffer = read_sha1_file(oid->hash, type, sizep); if (buffer && S_ISREG(mode)) { struct strbuf buf = STRBUF_INIT; size_t size = 0; |