archive: convert struct archiver_args to object_id

Change the commit_sha1 member to be called "commit_oid" and change it to
be a pointer to struct object_id.  Additionally, update some uses of
GIT_SHA1_HEXSZ and hard-coded values to use the_hash_algo instead.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/archive-tar.c b/archive-tar.c
index 4aabd566fbb8af7065ebe8fa62afe8e8e70abe04..3e53aac1e6523571ce0b9cb02d151c1f00652603 100644 (file)
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -326,14 +326,15 @@ static int write_tar_entry(struct archiver_args *args,
 
 static void write_global_extended_header(struct archiver_args *args)
 {
 
 static void write_global_extended_header(struct archiver_args *args)
 {

-       const unsigned char *sha1 = args->commit_sha1;
+       const struct object_id *oid = args->commit_oid;

        struct strbuf ext_header = STRBUF_INIT;
        struct ustar_header header;
        unsigned int mode;
 
        struct strbuf ext_header = STRBUF_INIT;
        struct ustar_header header;
        unsigned int mode;
 

-       if (sha1)
+       if (oid)

                strbuf_append_ext_header(&ext_header, "comment",
                strbuf_append_ext_header(&ext_header, "comment",

-                                        sha1_to_hex(sha1), 40);
+                                        oid_to_hex(oid),
+                                        the_hash_algo->hexsz);

        if (args->time > USTAR_MAX_MTIME) {
                strbuf_append_ext_header_uint(&ext_header, "mtime",
                                              args->time);
        if (args->time > USTAR_MAX_MTIME) {
                strbuf_append_ext_header_uint(&ext_header, "mtime",
                                              args->time);

diff --git a/archive-zip.c b/archive-zip.c
index 155ee4a779a1c2cd0cb2a7a8eea8c7ba8ba8502a..4d66b5be6e889e865cc998d1c59076e05ebd4712 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -577,7 +577,7 @@ static void write_zip64_trailer(void)
        write_or_die(1, &locator64, ZIP64_DIR_TRAILER_LOCATOR_SIZE);
 }
 
        write_or_die(1, &locator64, ZIP64_DIR_TRAILER_LOCATOR_SIZE);
 }
 

-static void write_zip_trailer(const unsigned char *sha1)
+static void write_zip_trailer(const struct object_id *oid)

 {
        struct zip_dir_trailer trailer;
        int clamped = 0;
 {
        struct zip_dir_trailer trailer;
        int clamped = 0;


@@ -590,14 +590,14 @@ static void write_zip_trailer(const unsigned char *sha1)
        copy_le16_clamp(trailer.entries, zip_dir_entries, &clamped);
        copy_le32(trailer.size, zip_dir.len);
        copy_le32_clamp(trailer.offset, zip_offset, &clamped);
        copy_le16_clamp(trailer.entries, zip_dir_entries, &clamped);
        copy_le32(trailer.size, zip_dir.len);
        copy_le32_clamp(trailer.offset, zip_offset, &clamped);

-       copy_le16(trailer.comment_length, sha1 ? GIT_SHA1_HEXSZ : 0);
+       copy_le16(trailer.comment_length, oid ? the_hash_algo->hexsz : 0);

 
        write_or_die(1, zip_dir.buf, zip_dir.len);
        if (clamped)
                write_zip64_trailer();
        write_or_die(1, &trailer, ZIP_DIR_TRAILER_SIZE);
 
        write_or_die(1, zip_dir.buf, zip_dir.len);
        if (clamped)
                write_zip64_trailer();
        write_or_die(1, &trailer, ZIP_DIR_TRAILER_SIZE);

-       if (sha1)
-               write_or_die(1, sha1_to_hex(sha1), GIT_SHA1_HEXSZ);
+       if (oid)
+               write_or_die(1, oid_to_hex(oid), the_hash_algo->hexsz);

 }
 
 static void dos_time(timestamp_t *timestamp, int *dos_date, int *dos_time)
 }
 
 static void dos_time(timestamp_t *timestamp, int *dos_date, int *dos_time)


@@ -635,7 +635,7 @@ static int write_zip_archive(const struct archiver *ar,
 
        err = write_archive_entries(args, write_zip_entry);
        if (!err)
 
        err = write_archive_entries(args, write_zip_entry);
        if (!err)

-               write_zip_trailer(args->commit_sha1);
+               write_zip_trailer(args->commit_oid);

 
        strbuf_release(&zip_dir);
 
 
        strbuf_release(&zip_dir);
 

diff --git a/archive.c b/archive.c
index 1f98324a930e39aa1a7c41e78b4fcd6450899c66..f2c78a2712b15505be7e0dae2e635b89c97082b8 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -380,7 +380,7 @@ static void parse_treeish_arg(const char **argv,
                int remote)
 {
        const char *name = argv[0];
                int remote)
 {
        const char *name = argv[0];

-       const unsigned char *commit_sha1;
+       const struct object_id *commit_oid;

        time_t archive_time;
        struct tree *tree;
        const struct commit *commit;
        time_t archive_time;
        struct tree *tree;
        const struct commit *commit;


@@ -402,10 +402,10 @@ static void parse_treeish_arg(const char **argv,
 
        commit = lookup_commit_reference_gently(ar_args->repo, &oid, 1);
        if (commit) {
 
        commit = lookup_commit_reference_gently(ar_args->repo, &oid, 1);
        if (commit) {

-               commit_sha1 = commit->object.oid.hash;
+               commit_oid = &commit->object.oid;

                archive_time = commit->date;
        } else {
                archive_time = commit->date;
        } else {

-               commit_sha1 = NULL;
+               commit_oid = NULL;

                archive_time = time(NULL);
        }
 
                archive_time = time(NULL);
        }
 


@@ -426,7 +426,7 @@ static void parse_treeish_arg(const char **argv,
                tree = parse_tree_indirect(&tree_oid);
        }
        ar_args->tree = tree;
                tree = parse_tree_indirect(&tree_oid);
        }
        ar_args->tree = tree;

-       ar_args->commit_sha1 = commit_sha1;
+       ar_args->commit_oid = commit_oid;

        ar_args->commit = commit;
        ar_args->time = archive_time;
 }
        ar_args->commit = commit;
        ar_args->time = archive_time;
 }

diff --git a/archive.h b/archive.h
index 21ac010699f034e7c8278a22d5387adf74b83ec8..dd022a6b46bc339d19b1c49ebc20214dd137685f 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -11,7 +11,7 @@ struct archiver_args {
        const char *base;
        size_t baselen;
        struct tree *tree;
        const char *base;
        size_t baselen;
        struct tree *tree;

-       const unsigned char *commit_sha1;
+       const struct object_id *commit_oid;

        const struct commit *commit;
        timestamp_t time;
        struct pathspec pathspec;
        const struct commit *commit;
        timestamp_t time;
        struct pathspec pathspec;