archive.c: convert to use struct object_id

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

diff --git a/archive.c b/archive.c
index 9e30246b6402454e8d92fb6aa24a1a07c534b0ef..2015f574c0b0028b84c1a0561cd8faf80a434eff 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -101,7 +101,7 @@ static void setup_archive_check(struct git_attr_check *check)
 
 struct directory {
        struct directory *up;
 
 struct directory {
        struct directory *up;

-       unsigned char sha1[20];
+       struct object_id oid;

        int baselen, len;
        unsigned mode;
        int stage;
        int baselen, len;
        unsigned mode;
        int stage;


@@ -177,7 +177,7 @@ static void queue_directory(const unsigned char *sha1,
        d->stage   = stage;
        c->bottom  = d;
        d->len = sprintf(d->path, "%.*s%s/", (int)base->len, base->buf, filename);
        d->stage   = stage;
        c->bottom  = d;
        d->len = sprintf(d->path, "%.*s%s/", (int)base->len, base->buf, filename);

-       hashcpy(d->sha1, sha1);
+       hashcpy(d->oid.hash, sha1);

 }
 
 static int write_directory(struct archiver_context *c)
 }
 
 static int write_directory(struct archiver_context *c)


@@ -191,7 +191,7 @@ static int write_directory(struct archiver_context *c)
        d->path[d->len - 1] = '\0'; /* no trailing slash */
        ret =
                write_directory(c) ||
        d->path[d->len - 1] = '\0'; /* no trailing slash */
        ret =
                write_directory(c) ||

-               write_archive_entry(d->sha1, d->path, d->baselen,
+               write_archive_entry(d->oid.hash, d->path, d->baselen,

                                    d->path + d->baselen, d->mode,
                                    d->stage, c) != READ_TREE_RECURSIVE;
        free(d);
                                    d->path + d->baselen, d->mode,
                                    d->stage, c) != READ_TREE_RECURSIVE;
        free(d);


@@ -354,7 +354,7 @@ static void parse_treeish_arg(const char **argv,
        time_t archive_time;
        struct tree *tree;
        const struct commit *commit;
        time_t archive_time;
        struct tree *tree;
        const struct commit *commit;

-       unsigned char sha1[20];
+       struct object_id oid;

 
        /* Remotes are only allowed to fetch actual refs */
        if (remote && !remote_allow_unreachable) {
 
        /* Remotes are only allowed to fetch actual refs */
        if (remote && !remote_allow_unreachable) {


@@ -362,15 +362,15 @@ static void parse_treeish_arg(const char **argv,
                const char *colon = strchrnul(name, ':');
                int refnamelen = colon - name;
 
                const char *colon = strchrnul(name, ':');
                int refnamelen = colon - name;
 

-               if (!dwim_ref(name, refnamelen, sha1, &ref))
+               if (!dwim_ref(name, refnamelen, oid.hash, &ref))

                        die("no such ref: %.*s", refnamelen, name);
                free(ref);
        }
 
                        die("no such ref: %.*s", refnamelen, name);
                free(ref);
        }
 

-       if (get_sha1(name, sha1))
+       if (get_sha1(name, oid.hash))

                die("Not a valid object name");
 
                die("Not a valid object name");
 

-       commit = lookup_commit_reference_gently(sha1, 1);
+       commit = lookup_commit_reference_gently(oid.hash, 1);

        if (commit) {
                commit_sha1 = commit->object.sha1;
                archive_time = commit->date;
        if (commit) {
                commit_sha1 = commit->object.sha1;
                archive_time = commit->date;


@@ -379,21 +379,21 @@ static void parse_treeish_arg(const char **argv,
                archive_time = time(NULL);
        }
 
                archive_time = time(NULL);
        }
 

-       tree = parse_tree_indirect(sha1);
+       tree = parse_tree_indirect(oid.hash);

        if (tree == NULL)
                die("not a tree object");
 
        if (prefix) {
        if (tree == NULL)
                die("not a tree object");
 
        if (prefix) {

-               unsigned char tree_sha1[20];
+               struct object_id tree_oid;

                unsigned int mode;
                int err;
 
                err = get_tree_entry(tree->object.sha1, prefix,
                unsigned int mode;
                int err;
 
                err = get_tree_entry(tree->object.sha1, prefix,

-                                    tree_sha1, &mode);
+                                    tree_oid.hash, &mode);

                if (err || !S_ISDIR(mode))
                        die("current working directory is untracked");
 
                if (err || !S_ISDIR(mode))
                        die("current working directory is untracked");
 

-               tree = parse_tree_indirect(tree_sha1);
+               tree = parse_tree_indirect(tree_oid.hash);

        }
        ar_args->tree = tree;
        ar_args->commit_sha1 = commit_sha1;
        }
        ar_args->tree = tree;
        ar_args->commit_sha1 = commit_sha1;