Convert remaining callers of lookup_commit_reference* to object_id

There are a small number of remaining callers of lookup_commit_reference
and lookup_commit_reference_gently that still need to be converted to
struct object_id.  Convert these.

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

diff --git a/notes-merge.c b/notes-merge.c
index 32caaaff7477d3640c81a19c54c1c92ffb8ca8b1..06d8be9cbfc578e2e89d7d3d5d700296b08b577f 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -535,7 +535,7 @@ int notes_merge(struct notes_merge_options *o,
                struct notes_tree *local_tree,
                unsigned char *result_sha1)
 {
                struct notes_tree *local_tree,
                unsigned char *result_sha1)
 {

-       unsigned char local_sha1[20], remote_sha1[20];
+       struct object_id local_oid, remote_oid;

        struct commit *local, *remote;
        struct commit_list *bases = NULL;
        const unsigned char *base_sha1, *base_tree_sha1;
        struct commit *local, *remote;
        struct commit_list *bases = NULL;
        const unsigned char *base_sha1, *base_tree_sha1;


@@ -549,46 +549,46 @@ int notes_merge(struct notes_merge_options *o,
               o->local_ref, o->remote_ref);
 
        /* Dereference o->local_ref into local_sha1 */
               o->local_ref, o->remote_ref);
 
        /* Dereference o->local_ref into local_sha1 */

-       if (read_ref_full(o->local_ref, 0, local_sha1, NULL))
+       if (read_ref_full(o->local_ref, 0, local_oid.hash, NULL))

                die("Failed to resolve local notes ref '%s'", o->local_ref);
        else if (!check_refname_format(o->local_ref, 0) &&
                die("Failed to resolve local notes ref '%s'", o->local_ref);
        else if (!check_refname_format(o->local_ref, 0) &&

-               is_null_sha1(local_sha1))
+               is_null_oid(&local_oid))

                local = NULL; /* local_sha1 == null_sha1 indicates unborn ref */
                local = NULL; /* local_sha1 == null_sha1 indicates unborn ref */

-       else if (!(local = lookup_commit_reference(local_sha1)))
+       else if (!(local = lookup_commit_reference(local_oid.hash)))

                die("Could not parse local commit %s (%s)",
                die("Could not parse local commit %s (%s)",

-                   sha1_to_hex(local_sha1), o->local_ref);
-       trace_printf("\tlocal commit: %.7s\n", sha1_to_hex(local_sha1));
+                   oid_to_hex(&local_oid), o->local_ref);
+       trace_printf("\tlocal commit: %.7s\n", oid_to_hex(&local_oid));

 
        /* Dereference o->remote_ref into remote_sha1 */
 
        /* Dereference o->remote_ref into remote_sha1 */

-       if (get_sha1(o->remote_ref, remote_sha1)) {
+       if (get_oid(o->remote_ref, &remote_oid)) {

                /*
                 * Failed to get remote_sha1. If o->remote_ref looks like an
                 * unborn ref, perform the merge using an empty notes tree.
                 */
                if (!check_refname_format(o->remote_ref, 0)) {
                /*
                 * Failed to get remote_sha1. If o->remote_ref looks like an
                 * unborn ref, perform the merge using an empty notes tree.
                 */
                if (!check_refname_format(o->remote_ref, 0)) {

-                       hashclr(remote_sha1);
+                       oidclr(&remote_oid);

                        remote = NULL;
                } else {
                        die("Failed to resolve remote notes ref '%s'",
                            o->remote_ref);
                }
                        remote = NULL;
                } else {
                        die("Failed to resolve remote notes ref '%s'",
                            o->remote_ref);
                }

-       } else if (!(remote = lookup_commit_reference(remote_sha1))) {
+       } else if (!(remote = lookup_commit_reference(remote_oid.hash))) {

                die("Could not parse remote commit %s (%s)",
                die("Could not parse remote commit %s (%s)",

-                   sha1_to_hex(remote_sha1), o->remote_ref);
+                   oid_to_hex(&remote_oid), o->remote_ref);

        }
        }

-       trace_printf("\tremote commit: %.7s\n", sha1_to_hex(remote_sha1));
+       trace_printf("\tremote commit: %.7s\n", oid_to_hex(&remote_oid));

 
        if (!local && !remote)
                die("Cannot merge empty notes ref (%s) into empty notes ref "
                    "(%s)", o->remote_ref, o->local_ref);
        if (!local) {
                /* result == remote commit */
 
        if (!local && !remote)
                die("Cannot merge empty notes ref (%s) into empty notes ref "
                    "(%s)", o->remote_ref, o->local_ref);
        if (!local) {
                /* result == remote commit */

-               hashcpy(result_sha1, remote_sha1);
+               hashcpy(result_sha1, remote_oid.hash);

                goto found_result;
        }
        if (!remote) {
                /* result == local commit */
                goto found_result;
        }
        if (!remote) {
                /* result == local commit */

-               hashcpy(result_sha1, local_sha1);
+               hashcpy(result_sha1, local_oid.hash);

                goto found_result;
        }
        assert(local && remote);
                goto found_result;
        }
        assert(local && remote);

diff --git a/ref-filter.c b/ref-filter.c
index 3a640448fd83e6cf0bda8ddda081757d5941361e..47cce0a1845cfc34b92c4cb65dbd77c94ffcae75 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -2090,7 +2090,7 @@ int parse_opt_ref_sorting(const struct option *opt, const char *arg, int unset)
 int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset)
 {
        struct ref_filter *rf = opt->value;
 int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset)
 {
        struct ref_filter *rf = opt->value;

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

        int no_merged = starts_with(opt->long_name, "no");
 
        if (rf->merge) {
        int no_merged = starts_with(opt->long_name, "no");
 
        if (rf->merge) {


@@ -2105,10 +2105,10 @@ int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset)
                ? REF_FILTER_MERGED_OMIT
                : REF_FILTER_MERGED_INCLUDE;
 
                ? REF_FILTER_MERGED_OMIT
                : REF_FILTER_MERGED_INCLUDE;
 

-       if (get_sha1(arg, sha1))
+       if (get_oid(arg, &oid))

                die(_("malformed object name %s"), arg);
 
                die(_("malformed object name %s"), arg);
 

-       rf->merge_commit = lookup_commit_reference_gently(sha1, 0);
+       rf->merge_commit = lookup_commit_reference_gently(oid.hash, 0);

        if (!rf->merge_commit)
                return opterror(opt, "must point to a commit", 0);
 
        if (!rf->merge_commit)
                return opterror(opt, "must point to a commit", 0);
 

diff --git a/sequencer.c b/sequencer.c
index b94830cf9e2b86e7a46fa638e1af11cf94ee729c..e44c015b2c925bc3ee001097c9a181ffd66f2081 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -1222,7 +1222,7 @@ static struct todo_item *append_new_todo(struct todo_list *todo_list)
 
 static int parse_insn_line(struct todo_item *item, const char *bol, char *eol)
 {
 
 static int parse_insn_line(struct todo_item *item, const char *bol, char *eol)
 {

-       unsigned char commit_sha1[20];
+       struct object_id commit_oid;

        char *end_of_object_name;
        int i, saved, status, padding;
 
        char *end_of_object_name;
        int i, saved, status, padding;
 


@@ -1271,7 +1271,7 @@ static int parse_insn_line(struct todo_item *item, const char *bol, char *eol)
        end_of_object_name = (char *) bol + strcspn(bol, " \t\n");
        saved = *end_of_object_name;
        *end_of_object_name = '\0';
        end_of_object_name = (char *) bol + strcspn(bol, " \t\n");
        saved = *end_of_object_name;
        *end_of_object_name = '\0';

-       status = get_sha1(bol, commit_sha1);
+       status = get_oid(bol, &commit_oid);

        *end_of_object_name = saved;
 
        item->arg = end_of_object_name + strspn(end_of_object_name, " \t");
        *end_of_object_name = saved;
 
        item->arg = end_of_object_name + strspn(end_of_object_name, " \t");


@@ -1280,7 +1280,7 @@ static int parse_insn_line(struct todo_item *item, const char *bol, char *eol)
        if (status < 0)
                return -1;
 
        if (status < 0)
                return -1;
 

-       item->commit = lookup_commit_reference(commit_sha1);
+       item->commit = lookup_commit_reference(commit_oid.hash);

        return !item->commit;
 }
 
        return !item->commit;
 }
 


@@ -2281,7 +2281,7 @@ static int single_pick(struct commit *cmit, struct replay_opts *opts)
 int sequencer_pick_revisions(struct replay_opts *opts)
 {
        struct todo_list todo_list = TODO_LIST_INIT;
 int sequencer_pick_revisions(struct replay_opts *opts)
 {
        struct todo_list todo_list = TODO_LIST_INIT;

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

        int i, res;
 
        assert(opts->revs);
        int i, res;
 
        assert(opts->revs);


@@ -2289,16 +2289,16 @@ int sequencer_pick_revisions(struct replay_opts *opts)
                return -1;
 
        for (i = 0; i < opts->revs->pending.nr; i++) {
                return -1;
 
        for (i = 0; i < opts->revs->pending.nr; i++) {

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

                const char *name = opts->revs->pending.objects[i].name;
 
                /* This happens when using --stdin. */
                if (!strlen(name))
                        continue;
 
                const char *name = opts->revs->pending.objects[i].name;
 
                /* This happens when using --stdin. */
                if (!strlen(name))
                        continue;
 

-               if (!get_sha1(name, sha1)) {
-                       if (!lookup_commit_reference_gently(sha1, 1)) {
-                               enum object_type type = sha1_object_info(sha1, NULL);
+               if (!get_oid(name, &oid)) {
+                       if (!lookup_commit_reference_gently(oid.hash, 1)) {
+                               enum object_type type = sha1_object_info(oid.hash, NULL);

                                return error(_("%s: can't cherry-pick a %s"),
                                        name, typename(type));
                        }
                                return error(_("%s: can't cherry-pick a %s"),
                                        name, typename(type));
                        }


@@ -2335,9 +2335,9 @@ int sequencer_pick_revisions(struct replay_opts *opts)
        if (walk_revs_populate_todo(&todo_list, opts) ||
                        create_seq_dir() < 0)
                return -1;
        if (walk_revs_populate_todo(&todo_list, opts) ||
                        create_seq_dir() < 0)
                return -1;

-       if (get_sha1("HEAD", sha1) && (opts->action == REPLAY_REVERT))
+       if (get_oid("HEAD", &oid) && (opts->action == REPLAY_REVERT))

                return error(_("can't revert as initial commit"));
                return error(_("can't revert as initial commit"));

-       if (save_head(sha1_to_hex(sha1)))
+       if (save_head(oid_to_hex(&oid)))

                return -1;
        if (save_opts(opts))
                return -1;
                return -1;
        if (save_opts(opts))
                return -1;

diff --git a/sha1_name.c b/sha1_name.c
index 8eec9f7c1bb59b8124e098367b7bff552bcafcf4..8889190a90b89bf54350ccb21d778a60d79bea0f 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -722,14 +722,14 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
 static int get_parent(const char *name, int len,
                      unsigned char *result, int idx)
 {
 static int get_parent(const char *name, int len,
                      unsigned char *result, int idx)
 {

-       unsigned char sha1[20];
-       int ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH);
+       struct object_id oid;
+       int ret = get_sha1_1(name, len, oid.hash, GET_SHA1_COMMITTISH);

        struct commit *commit;
        struct commit_list *p;
 
        if (ret)
                return ret;
        struct commit *commit;
        struct commit_list *p;
 
        if (ret)
                return ret;

-       commit = lookup_commit_reference(sha1);
+       commit = lookup_commit_reference(oid.hash);

        if (parse_commit(commit))
                return -1;
        if (!idx) {
        if (parse_commit(commit))
                return -1;
        if (!idx) {


@@ -750,14 +750,14 @@ static int get_parent(const char *name, int len,
 static int get_nth_ancestor(const char *name, int len,
                            unsigned char *result, int generation)
 {
 static int get_nth_ancestor(const char *name, int len,
                            unsigned char *result, int generation)
 {

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

        struct commit *commit;
        int ret;
 
        struct commit *commit;
        int ret;
 

-       ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH);
+       ret = get_sha1_1(name, len, oid.hash, GET_SHA1_COMMITTISH);

        if (ret)
                return ret;
        if (ret)
                return ret;

-       commit = lookup_commit_reference(sha1);
+       commit = lookup_commit_reference(oid.hash);

        if (!commit)
                return -1;
 
        if (!commit)
                return -1;
 

diff --git a/shallow.c b/shallow.c
index c520ae3aea1e9d041905e57eef938e70dac726db..1327ee16fc2d11c24cd58095d77141affe703d7f 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -466,7 +466,7 @@ static uint32_t *paint_alloc(struct paint_info *info)
  * UNINTERESTING or BOTTOM is hit. Set the id-th bit in ref_bitmap for
  * all walked commits.
  */
  * UNINTERESTING or BOTTOM is hit. Set the id-th bit in ref_bitmap for
  * all walked commits.
  */

-static void paint_down(struct paint_info *info, const unsigned char *sha1,
+static void paint_down(struct paint_info *info, const struct object_id *oid,

                       unsigned int id)
 {
        unsigned int i, nr;
                       unsigned int id)
 {
        unsigned int i, nr;


@@ -475,7 +475,7 @@ static void paint_down(struct paint_info *info, const unsigned char *sha1,
        size_t bitmap_size = st_mult(sizeof(uint32_t), bitmap_nr);
        uint32_t *tmp = xmalloc(bitmap_size); /* to be freed before return */
        uint32_t *bitmap = paint_alloc(info);
        size_t bitmap_size = st_mult(sizeof(uint32_t), bitmap_nr);
        uint32_t *tmp = xmalloc(bitmap_size); /* to be freed before return */
        uint32_t *bitmap = paint_alloc(info);

-       struct commit *c = lookup_commit_reference_gently(sha1, 1);
+       struct commit *c = lookup_commit_reference_gently(oid->hash, 1);

        if (!c)
                return;
        memset(bitmap, 0, bitmap_size);
        if (!c)
                return;
        memset(bitmap, 0, bitmap_size);


@@ -604,7 +604,7 @@ void assign_shallow_commits_to_refs(struct shallow_info *info,
        }
 
        for (i = 0; i < ref->nr; i++)
        }
 
        for (i = 0; i < ref->nr; i++)

-               paint_down(&pi, ref->oid[i].hash, i);
+               paint_down(&pi, ref->oid + i, i);

 
        if (used) {
                int bitmap_size = ((pi.nr_bits + 31) / 32) * sizeof(uint32_t);
 
        if (used) {
                int bitmap_size = ((pi.nr_bits + 31) / 32) * sizeof(uint32_t);

diff --git a/submodule.c b/submodule.c
index 9bdd5f6055623333a13c768acdac759ed2ebb41b..d5c28b9f1bde32442392076d0094b2f2bac85583 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -896,17 +896,17 @@ int push_unpushed_submodules(struct oid_array *commits,
        return ret;
 }
 
        return ret;
 }
 

-static int is_submodule_commit_present(const char *path, unsigned char sha1[20])
+static int is_submodule_commit_present(const char *path, struct object_id *oid)

 {
        int is_present = 0;
 {
        int is_present = 0;

-       if (!add_submodule_odb(path) && lookup_commit_reference(sha1)) {
+       if (!add_submodule_odb(path) && lookup_commit_reference(oid->hash)) {

                /* Even if the submodule is checked out and the commit is
                 * present, make sure it is reachable from a ref. */
                struct child_process cp = CHILD_PROCESS_INIT;
                const char *argv[] = {"rev-list", "-n", "1", NULL, "--not", "--all", NULL};
                struct strbuf buf = STRBUF_INIT;
 
                /* Even if the submodule is checked out and the commit is
                 * present, make sure it is reachable from a ref. */
                struct child_process cp = CHILD_PROCESS_INIT;
                const char *argv[] = {"rev-list", "-n", "1", NULL, "--not", "--all", NULL};
                struct strbuf buf = STRBUF_INIT;
 

-               argv[3] = sha1_to_hex(sha1);
+               argv[3] = oid_to_hex(oid);

                cp.argv = argv;
                prepare_submodule_repo_env(&cp.env_array);
                cp.git_cmd = 1;
                cp.argv = argv;
                prepare_submodule_repo_env(&cp.env_array);
                cp.git_cmd = 1;


@@ -937,7 +937,7 @@ static void submodule_collect_changed_cb(struct diff_queue_struct *q,
                         * being moved around. */
                        struct string_list_item *path;
                        path = unsorted_string_list_lookup(&changed_submodule_paths, p->two->path);
                         * being moved around. */
                        struct string_list_item *path;
                        path = unsorted_string_list_lookup(&changed_submodule_paths, p->two->path);

-                       if (!path && !is_submodule_commit_present(p->two->path, p->two->oid.hash))
+                       if (!path && !is_submodule_commit_present(p->two->path, &p->two->oid))

                                string_list_append(&changed_submodule_paths, xstrdup(p->two->path));
                } else {
                        /* Submodule is new or was moved here */
                                string_list_append(&changed_submodule_paths, xstrdup(p->two->path));
                } else {
                        /* Submodule is new or was moved here */