tree-walk: convert tree entry functions to object_id

Convert get_tree_entry and find_tree_entry to take pointers to 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 da62b2f54187dfb9a292de976c24666c78efc479..1ab62d426e8cd2426294d252f2a78ef94760dee0 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -397,8 +397,8 @@ static void parse_treeish_arg(const char **argv,
                unsigned int mode;
                int err;
 
                unsigned int mode;
                int err;
 

-               err = get_tree_entry(tree->object.oid.hash, prefix,
-                                    tree_oid.hash, &mode);
+               err = get_tree_entry(&tree->object.oid, prefix, &tree_oid,
+                                    &mode);

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

diff --git a/blame.c b/blame.c
index 00b97c18986091c50140dd644c9dc2405162c600..cc2cc9294443c9e4267aae7ccbc9dddaf69c4592 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -80,7 +80,7 @@ static void verify_working_tree_path(struct commit *work_tree, const char *path)
                struct object_id blob_oid;
                unsigned mode;
 
                struct object_id blob_oid;
                unsigned mode;
 

-               if (!get_tree_entry(commit_oid->hash, path, blob_oid.hash, &mode) &&
+               if (!get_tree_entry(commit_oid, path, &blob_oid, &mode) &&

                    oid_object_info(&blob_oid, NULL) == OBJ_BLOB)
                        return;
        }
                    oid_object_info(&blob_oid, NULL) == OBJ_BLOB)
                        return;
        }


@@ -502,9 +502,7 @@ static int fill_blob_sha1_and_mode(struct blame_origin *origin)
 {
        if (!is_null_oid(&origin->blob_oid))
                return 0;
 {
        if (!is_null_oid(&origin->blob_oid))
                return 0;

-       if (get_tree_entry(origin->commit->object.oid.hash,
-                          origin->path,
-                          origin->blob_oid.hash, &origin->mode))
+       if (get_tree_entry(&origin->commit->object.oid, origin->path, &origin->blob_oid, &origin->mode))

                goto error_out;
        if (oid_object_info(&origin->blob_oid, NULL) != OBJ_BLOB)
                goto error_out;
                goto error_out;
        if (oid_object_info(&origin->blob_oid, NULL) != OBJ_BLOB)
                goto error_out;

diff --git a/builtin/rm.c b/builtin/rm.c
index 4a2fcca27b3f722ca520c2411b80e6984ecf780a..974a7ef5bf5f9b427e4083caed09f04dcfddd2b3 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -178,7 +178,7 @@ static int check_local_mod(struct object_id *head, int index_only)
                 * way as changed from the HEAD.
                 */
                if (no_head
                 * way as changed from the HEAD.
                 */
                if (no_head

-                    || get_tree_entry(head->hash, name, oid.hash, &mode)
+                    || get_tree_entry(head, name, &oid, &mode)

                     || ce->ce_mode != create_ce_mode(mode)
                     || oidcmp(&ce->oid, &oid))
                        staged_changes = 1;
                     || ce->ce_mode != create_ce_mode(mode)
                     || oidcmp(&ce->oid, &oid))
                        staged_changes = 1;

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 58d1c2d2827d61899d73f1ea7632c5ee219f3ace..9625d1e10a691c1dbd2ec2aa5d10a6c8a6ca7885 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -592,7 +592,7 @@ static struct cache_entry *read_one_ent(const char *which,
        int size;
        struct cache_entry *ce;
 
        int size;
        struct cache_entry *ce;
 

-       if (get_tree_entry(ent->hash, path, oid.hash, &mode)) {
+       if (get_tree_entry(ent, path, &oid, &mode)) {

                if (which)
                        error("%s: not in %s branch.", path, which);
                return NULL;
                if (which)
                        error("%s: not in %s branch.", path, which);
                return NULL;

diff --git a/line-log.c b/line-log.c
index cdc2257db56f7d68412bb456e91854a9e9aa5cd5..ecdce08c4be24cc14109796d9a7c165c53753a88 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -501,8 +501,7 @@ static void fill_blob_sha1(struct commit *commit, struct diff_filespec *spec)
        unsigned mode;
        struct object_id oid;
 
        unsigned mode;
        struct object_id oid;
 

-       if (get_tree_entry(commit->object.oid.hash, spec->path,
-                          oid.hash, &mode))
+       if (get_tree_entry(&commit->object.oid, spec->path, &oid, &mode))

                die("There is no path %s in the commit", spec->path);
        fill_filespec(spec, &oid, 1, mode);
 
                die("There is no path %s in the commit", spec->path);
        fill_filespec(spec, &oid, 1, mode);
 

diff --git a/match-trees.c b/match-trees.c
index 0ca99d51626f49b5d4a88b9edc43c533c970dd0e..10d6c39d47b4d59a5f6c73dc448c86638a531287 100644 (file)
--- a/match-trees.c
+++ b/match-trees.c
@@ -269,7 +269,7 @@ void shift_tree(const struct object_id *hash1,
                if (!*del_prefix)
                        return;
 
                if (!*del_prefix)
                        return;
 

-               if (get_tree_entry(hash2->hash, del_prefix, shifted->hash, &mode))
+               if (get_tree_entry(hash2, del_prefix, shifted, &mode))

                        die("cannot find path %s in tree %s",
                            del_prefix, oid_to_hex(hash2));
                return;
                        die("cannot find path %s in tree %s",
                            del_prefix, oid_to_hex(hash2));
                return;


@@ -296,12 +296,12 @@ void shift_tree_by(const struct object_id *hash1,
        unsigned candidate = 0;
 
        /* Can hash2 be a tree at shift_prefix in tree hash1? */
        unsigned candidate = 0;
 
        /* Can hash2 be a tree at shift_prefix in tree hash1? */

-       if (!get_tree_entry(hash1->hash, shift_prefix, sub1.hash, &mode1) &&
+       if (!get_tree_entry(hash1, shift_prefix, &sub1, &mode1) &&

            S_ISDIR(mode1))
                candidate |= 1;
 
        /* Can hash1 be a tree at shift_prefix in tree hash2? */
            S_ISDIR(mode1))
                candidate |= 1;
 
        /* Can hash1 be a tree at shift_prefix in tree hash2? */

-       if (!get_tree_entry(hash2->hash, shift_prefix, sub2.hash, &mode2) &&
+       if (!get_tree_entry(hash2, shift_prefix, &sub2, &mode2) &&

            S_ISDIR(mode2))
                candidate |= 2;
 
            S_ISDIR(mode2))
                candidate |= 2;
 

diff --git a/merge-recursive.c b/merge-recursive.c
index f58f13957eefe68a3e1231f94174a15ce427079c..85f8cbee99f9ab517d5eed99bca7fa6b3ed20946 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -370,12 +370,12 @@ static struct stage_data *insert_stage_data(const char *path,
 {
        struct string_list_item *item;
        struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
 {
        struct string_list_item *item;
        struct stage_data *e = xcalloc(1, sizeof(struct stage_data));

-       get_tree_entry(o->object.oid.hash, path,
-                       e->stages[1].oid.hash, &e->stages[1].mode);
-       get_tree_entry(a->object.oid.hash, path,
-                       e->stages[2].oid.hash, &e->stages[2].mode);
-       get_tree_entry(b->object.oid.hash, path,
-                       e->stages[3].oid.hash, &e->stages[3].mode);
+       get_tree_entry(&o->object.oid, path,
+                       &e->stages[1].oid, &e->stages[1].mode);
+       get_tree_entry(&a->object.oid, path,
+                       &e->stages[2].oid, &e->stages[2].mode);
+       get_tree_entry(&b->object.oid, path,
+                       &e->stages[3].oid, &e->stages[3].mode);

        item = string_list_insert(entries, path);
        item->util = e;
        return e;
        item = string_list_insert(entries, path);
        item->util = e;
        return e;

diff --git a/notes.c b/notes.c
index ce9a8f53f8668bbbf790f3b2d20f641fc034c301..d25121a65d4aefb1ae3c9e1f7c12308168c63c72 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -1012,7 +1012,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
                return;
        if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, &object_oid))
                die("Cannot use notes ref %s", notes_ref);
                return;
        if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, &object_oid))
                die("Cannot use notes ref %s", notes_ref);

-       if (get_tree_entry(object_oid.hash, "", oid.hash, &mode))
+       if (get_tree_entry(&object_oid, "", &oid, &mode))

                die("Failed to read notes tree referenced by %s (%s)",
                    notes_ref, oid_to_hex(&object_oid));
 
                die("Failed to read notes tree referenced by %s (%s)",
                    notes_ref, oid_to_hex(&object_oid));
 

diff --git a/sha1_name.c b/sha1_name.c
index d129dc4f31015c0144df4b70523589bf12637831..39e911c8bab21535ea6aef88c612cd282788e495 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -1529,8 +1529,7 @@ static void diagnose_invalid_oid_path(const char *prefix,
        if (is_missing_file_error(errno)) {
                char *fullname = xstrfmt("%s%s", prefix, filename);
 
        if (is_missing_file_error(errno)) {
                char *fullname = xstrfmt("%s%s", prefix, filename);
 

-               if (!get_tree_entry(tree_oid->hash, fullname,
-                                   oid.hash, &mode)) {
+               if (!get_tree_entry(tree_oid, fullname, &oid, &mode)) {

                        die("Path '%s' exists, but not '%s'.\n"
                            "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
                            fullname,
                        die("Path '%s' exists, but not '%s'.\n"
                            "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
                            fullname,


@@ -1722,8 +1721,8 @@ static int get_oid_with_context_1(const char *name,
                                        filename, oid->hash, &oc->symlink_path,
                                        &oc->mode);
                        } else {
                                        filename, oid->hash, &oc->symlink_path,
                                        &oc->mode);
                        } else {

-                               ret = get_tree_entry(tree_oid.hash, filename,
-                                                    oid->hash, &oc->mode);
+                               ret = get_tree_entry(&tree_oid, filename, oid,
+                                                    &oc->mode);

                                if (ret && only_to_die) {
                                        diagnose_invalid_oid_path(prefix,
                                                                   filename,
                                if (ret && only_to_die) {
                                        diagnose_invalid_oid_path(prefix,
                                                                   filename,

diff --git a/tree-walk.c b/tree-walk.c
index 521defdaa2339ca474fd98804c0287b19bc13c23..a60837c491d5ad6fb6b42ae029a05c65c681eaef 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -492,7 +492,7 @@ struct dir_state {
        unsigned char sha1[20];
 };
 
        unsigned char sha1[20];
 };
 

-static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char *result, unsigned *mode)
+static int find_tree_entry(struct tree_desc *t, const char *name, struct object_id *result, unsigned *mode)

 {
        int namelen = strlen(name);
        while (t->size) {
 {
        int namelen = strlen(name);
        while (t->size) {


@@ -511,7 +511,7 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char
                if (cmp < 0)
                        break;
                if (entrylen == namelen) {
                if (cmp < 0)
                        break;
                if (entrylen == namelen) {

-                       hashcpy(result, oid->hash);
+                       oidcpy(result, oid);

                        return 0;
                }
                if (name[entrylen] != '/')
                        return 0;
                }
                if (name[entrylen] != '/')


@@ -519,27 +519,27 @@ static int find_tree_entry(struct tree_desc *t, const char *name, unsigned char
                if (!S_ISDIR(*mode))
                        break;
                if (++entrylen == namelen) {
                if (!S_ISDIR(*mode))
                        break;
                if (++entrylen == namelen) {

-                       hashcpy(result, oid->hash);
+                       oidcpy(result, oid);

                        return 0;
                }
                        return 0;
                }

-               return get_tree_entry(oid->hash, name + entrylen, result, mode);
+               return get_tree_entry(oid, name + entrylen, result, mode);

        }
        return -1;
 }
 
        }
        return -1;
 }
 

-int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned char *sha1, unsigned *mode)
+int get_tree_entry(const struct object_id *tree_oid, const char *name, struct object_id *oid, unsigned *mode)

 {
        int retval;
        void *tree;
        unsigned long size;
 {
        int retval;
        void *tree;
        unsigned long size;

-       unsigned char root[20];
+       struct object_id root;

 
 

-       tree = read_object_with_reference(tree_sha1, tree_type, &size, root);
+       tree = read_object_with_reference(tree_oid->hash, tree_type, &size, root.hash);

        if (!tree)
                return -1;
 
        if (name[0] == '\0') {
        if (!tree)
                return -1;
 
        if (name[0] == '\0') {

-               hashcpy(sha1, root);
+               oidcpy(oid, &root);

                free(tree);
                return 0;
        }
                free(tree);
                return 0;
        }


@@ -549,7 +549,7 @@ int get_tree_entry(const unsigned char *tree_sha1, const char *name, unsigned ch
        } else {
                struct tree_desc t;
                init_tree_desc(&t, tree, size);
        } else {
                struct tree_desc t;
                init_tree_desc(&t, tree, size);

-               retval = find_tree_entry(&t, name, sha1, mode);
+               retval = find_tree_entry(&t, name, oid, mode);

        }
        free(tree);
        return retval;
        }
        free(tree);
        return retval;


@@ -671,7 +671,7 @@ enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_s
 
                /* Look up the first (or only) path component in the tree. */
                find_result = find_tree_entry(&t, namebuf.buf,
 
                /* Look up the first (or only) path component in the tree. */
                find_result = find_tree_entry(&t, namebuf.buf,

-                                             current_tree_oid.hash, mode);
+                                             &current_tree_oid, mode);

                if (find_result) {
                        goto done;
                }
                if (find_result) {
                        goto done;
                }

diff --git a/tree-walk.h b/tree-walk.h
index b6bd1b4ccfbb8bb69c464ea687c63a2058a424b8..4617deeb0e09e71c7ba7231192ece055eccb2dde 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -79,7 +79,7 @@ struct traverse_info {
        int show_all_errors;
 };
 
        int show_all_errors;
 };
 

-int get_tree_entry(const unsigned char *, const char *, unsigned char *, unsigned *);
+int get_tree_entry(const struct object_id *, const char *, struct object_id *, unsigned *);

 extern char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n);
 extern void setup_traverse_info(struct traverse_info *info, const char *base);
 
 extern char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n);
 extern void setup_traverse_info(struct traverse_info *info, const char *base);