diff options
author | René Scharfe <l.s.r@web.de> | 2021-08-27 22:59:16 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-08-28 00:19:00 +0300 |
commit | e124ecf7f7643c83c4f23badb8e1437f863549c7 (patch) | |
tree | f2e3d783cdb86bdc1b31bb7938e64f33b3974c3c | |
parent | 225bc32a989d7a22fa6addafd4ce7dcd04675dbf (diff) |
archive: convert queue_directory to struct object_id
Pass the struct object_id on instead of just its hash member.
This is simpler and avoids the need to guess the algorithm.
Signed-off-by: René Scharfe <l.s.r@web.de>
Acked-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | archive.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -191,7 +191,7 @@ static int write_archive_entry(const struct object_id *oid, const char *base, return err; } -static void queue_directory(const unsigned char *sha1, +static void queue_directory(const struct object_id *oid, struct strbuf *base, const char *filename, unsigned mode, struct archiver_context *c) { @@ -203,7 +203,7 @@ static void queue_directory(const unsigned char *sha1, d->mode = mode; c->bottom = d; d->len = xsnprintf(d->path, len, "%.*s%s/", (int)base->len, base->buf, filename); - oidread(&d->oid, sha1); + oidcpy(&d->oid, oid); } static int write_directory(struct archiver_context *c) @@ -250,8 +250,7 @@ static int queue_or_write_archive_entry(const struct object_id *oid, if (check_attr_export_ignore(check)) return 0; - queue_directory(oid->hash, base, filename, - mode, c); + queue_directory(oid, base, filename, mode, c); return READ_TREE_RECURSIVE; } |