Make sha1_array_append take a struct object_id *

Convert the callers to pass struct object_id by changing the function
declaration and definition and applying the following semantic patch:

@@
expression E1, E2;
@@
- sha1_array_append(E1, E2.hash)
+ sha1_array_append(E1, &E2)

@@
expression E1, E2;
@@
- sha1_array_append(E1, E2->hash)
+ sha1_array_append(E1, E2)

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

diff --git a/bisect.c b/bisect.c
index ebaf7b05bad1b8496c224ea3a308614720874135..886e6308848a4115fbc23dde26350c81997a10df 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -413,9 +413,9 @@ static int register_ref(const char *refname, const struct object_id *oid,
                current_bad_oid = xmalloc(sizeof(*current_bad_oid));
                oidcpy(current_bad_oid, oid);
        } else if (starts_with(refname, good_prefix.buf)) {
                current_bad_oid = xmalloc(sizeof(*current_bad_oid));
                oidcpy(current_bad_oid, oid);
        } else if (starts_with(refname, good_prefix.buf)) {

-               sha1_array_append(&good_revs, oid->hash);
+               sha1_array_append(&good_revs, oid);

        } else if (starts_with(refname, "skip-")) {
        } else if (starts_with(refname, "skip-")) {

-               sha1_array_append(&skipped_revs, oid->hash);
+               sha1_array_append(&skipped_revs, oid);

        }
 
        strbuf_release(&good_prefix);
        }
 
        strbuf_release(&good_prefix);

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 8b85cb8cf083e70580f77392cd5e6391318d19c6..8fbb6671705a56f7c8382cff4ecf695843c07536 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -413,7 +413,7 @@ static int batch_loose_object(const struct object_id *oid,
                              const char *path,
                              void *data)
 {
                              const char *path,
                              void *data)
 {

-       sha1_array_append(data, oid->hash);
+       sha1_array_append(data, oid);

        return 0;
 }
 
        return 0;
 }
 


@@ -422,7 +422,7 @@ static int batch_packed_object(const struct object_id *oid,
                               uint32_t pos,
                               void *data)
 {
                               uint32_t pos,
                               void *data)
 {

-       sha1_array_append(data, oid->hash);
+       sha1_array_append(data, oid);

        return 0;
 }
 
        return 0;
 }
 

diff --git a/builtin/diff.c b/builtin/diff.c
index 398eee00d5d7d1b802c7eb659c002b65cafee10e..a5b34eb15636cdfdee452db0fd855763f0779902 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -193,7 +193,7 @@ static int builtin_diff_combined(struct rev_info *revs,
        if (!revs->dense_combined_merges && !revs->combine_merges)
                revs->dense_combined_merges = revs->combine_merges = 1;
        for (i = 1; i < ents; i++)
        if (!revs->dense_combined_merges && !revs->combine_merges)
                revs->dense_combined_merges = revs->combine_merges = 1;
        for (i = 1; i < ents; i++)

-               sha1_array_append(&parents, ent[i].item->oid.hash);
+               sha1_array_append(&parents, &ent[i].item->oid);

        diff_tree_combined(ent[0].item->oid.hash, &parents,
                           revs->dense_combined_merges, revs);
        sha1_array_clear(&parents);
        diff_tree_combined(ent[0].item->oid.hash, &parents,
                           revs->dense_combined_merges, revs);
        sha1_array_clear(&parents);

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 16517f26375b1a0ebe58b628b7741c7f5e77bc08..dfeacd5c37c397a520bbd325f24244e1677d3288 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2739,12 +2739,12 @@ static void record_recent_object(struct object *obj,
                                 const char *name,
                                 void *data)
 {
                                 const char *name,
                                 void *data)
 {

-       sha1_array_append(&recent_objects, obj->oid.hash);
+       sha1_array_append(&recent_objects, &obj->oid);

 }
 
 static void record_recent_commit(struct commit *commit, void *data)
 {
 }
 
 static void record_recent_commit(struct commit *commit, void *data)
 {

-       sha1_array_append(&recent_objects, commit->object.oid.hash);
+       sha1_array_append(&recent_objects, &commit->object.oid);

 }
 
 static void get_object_list(int ac, const char **av)
 }
 
 static void get_object_list(int ac, const char **av)

diff --git a/builtin/pull.c b/builtin/pull.c
index c007900ab5af7a3f48c3541b38dc87173bdda0ce..183e3771473cefa4dacd591bf43131047f6d5679 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -344,7 +344,7 @@ static void get_merge_heads(struct sha1_array *merge_heads)
                        continue;  /* invalid line: does not start with SHA1 */
                if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t"))
                        continue;  /* ref is not-for-merge */
                        continue;  /* invalid line: does not start with SHA1 */
                if (starts_with(sb.buf + GIT_SHA1_HEXSZ, "\tnot-for-merge\t"))
                        continue;  /* ref is not-for-merge */

-               sha1_array_append(merge_heads, oid.hash);
+               sha1_array_append(merge_heads, &oid);

        }
        fclose(fp);
        strbuf_release(&sb);
        }
        fclose(fp);
        strbuf_release(&sb);

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index d6097ee08ceff03cbc26aa97f884333ed5d2c450..2853ea0f997009a6e47146e96053ac73aba4c4a3 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -842,7 +842,7 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
                if (si->used_shallow[i] &&
                    (si->used_shallow[i][cmd->index / 32] & mask) &&
                    !delayed_reachability_test(si, i))
                if (si->used_shallow[i] &&
                    (si->used_shallow[i][cmd->index / 32] & mask) &&
                    !delayed_reachability_test(si, i))

-                       sha1_array_append(&extra, si->shallow->oid[i].hash);
+                       sha1_array_append(&extra, &si->shallow->oid[i]);

 
        opt.env = tmp_objdir_env(tmp_objdir);
        setup_alternate_shallow(&shallow_lock, &opt.shallow_file, &extra);
 
        opt.env = tmp_objdir_env(tmp_objdir);
        setup_alternate_shallow(&shallow_lock, &opt.shallow_file, &extra);


@@ -1546,7 +1546,7 @@ static struct command *read_head_info(struct sha1_array *shallow)
                        if (get_oid_hex(line + 8, &oid))
                                die("protocol error: expected shallow sha, got '%s'",
                                    line + 8);
                        if (get_oid_hex(line + 8, &oid))
                                die("protocol error: expected shallow sha, got '%s'",
                                    line + 8);

-                       sha1_array_append(shallow, oid.hash);
+                       sha1_array_append(shallow, &oid);

                        continue;
                }
 
                        continue;
                }
 


@@ -1817,7 +1817,7 @@ static void update_shallow_info(struct command *commands,
        for (cmd = commands; cmd; cmd = cmd->next) {
                if (is_null_oid(&cmd->new_oid))
                        continue;
        for (cmd = commands; cmd; cmd = cmd->next) {
                if (is_null_oid(&cmd->new_oid))
                        continue;

-               sha1_array_append(ref, cmd->new_oid.hash);
+               sha1_array_append(ref, &cmd->new_oid);

                cmd->index = ref->nr - 1;
        }
        si->ref = ref;
                cmd->index = ref->nr - 1;
        }
        si->ref = ref;

diff --git a/combine-diff.c b/combine-diff.c
index a5b86d7eb9b470e18f8854200fcb741b736e8224..c92029484c631cfd90f45683b91f68b23919fcf3 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1535,7 +1535,7 @@ void diff_tree_combined_merge(const struct commit *commit, int dense,
        struct sha1_array parents = SHA1_ARRAY_INIT;
 
        while (parent) {
        struct sha1_array parents = SHA1_ARRAY_INIT;
 
        while (parent) {

-               sha1_array_append(&parents, parent->item->object.oid.hash);
+               sha1_array_append(&parents, &parent->item->object.oid);

                parent = parent->next;
        }
        diff_tree_combined(commit->object.oid.hash, &parents, dense, rev);
                parent = parent->next;
        }
        diff_tree_combined(commit->object.oid.hash, &parents, dense, rev);

diff --git a/connect.c b/connect.c
index 7d65c1c73634363e85a652619cc8705223bc70cb..50b503da0db608f2154dfdb5ff639643c2eebbc1 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -153,7 +153,7 @@ struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,
                                die("protocol error: expected shallow sha-1, got '%s'", arg);
                        if (!shallow_points)
                                die("repository on the other end cannot be shallow");
                                die("protocol error: expected shallow sha-1, got '%s'", arg);
                        if (!shallow_points)
                                die("repository on the other end cannot be shallow");

-                       sha1_array_append(shallow_points, old_oid.hash);
+                       sha1_array_append(shallow_points, &old_oid);

                        continue;
                }
 
                        continue;
                }
 


@@ -169,7 +169,7 @@ struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,
                }
 
                if (extra_have && !strcmp(name, ".have")) {
                }
 
                if (extra_have && !strcmp(name, ".have")) {

-                       sha1_array_append(extra_have, old_oid.hash);
+                       sha1_array_append(extra_have, &old_oid);

                        continue;
                }
 
                        continue;
                }
 

diff --git a/fetch-pack.c b/fetch-pack.c
index 543e8aa9e181119cacff3c749c990c15bf9c2db1..a2e28443188d31b816d2d1889723b6958fad850c 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1042,7 +1042,7 @@ static void update_shallow(struct fetch_pack_args *args,
                struct object_id *oid = si->shallow->oid;
                for (i = 0; i < si->shallow->nr; i++)
                        if (has_object_file(&oid[i]))
                struct object_id *oid = si->shallow->oid;
                for (i = 0; i < si->shallow->nr; i++)
                        if (has_object_file(&oid[i]))

-                               sha1_array_append(&extra, oid[i].hash);
+                               sha1_array_append(&extra, &oid[i]);

                if (extra.nr) {
                        setup_alternate_shallow(&shallow_lock,
                                                &alternate_shallow_file,
                if (extra.nr) {
                        setup_alternate_shallow(&shallow_lock,
                                                &alternate_shallow_file,


@@ -1060,7 +1060,7 @@ static void update_shallow(struct fetch_pack_args *args,
        if (!si->nr_ours && !si->nr_theirs)
                return;
        for (i = 0; i < nr_sought; i++)
        if (!si->nr_ours && !si->nr_theirs)
                return;
        for (i = 0; i < nr_sought; i++)

-               sha1_array_append(&ref, sought[i]->old_oid.hash);
+               sha1_array_append(&ref, &sought[i]->old_oid);

        si->ref = &ref;
 
        if (args->update_shallow) {
        si->ref = &ref;
 
        if (args->update_shallow) {


@@ -1078,9 +1078,9 @@ static void update_shallow(struct fetch_pack_args *args,
                        return;
                }
                for (i = 0; i < si->nr_ours; i++)
                        return;
                }
                for (i = 0; i < si->nr_ours; i++)

-                       sha1_array_append(&extra, oid[si->ours[i]].hash);
+                       sha1_array_append(&extra, &oid[si->ours[i]]);

                for (i = 0; i < si->nr_theirs; i++)
                for (i = 0; i < si->nr_theirs; i++)

-                       sha1_array_append(&extra, oid[si->theirs[i]].hash);
+                       sha1_array_append(&extra, &oid[si->theirs[i]]);

                setup_alternate_shallow(&shallow_lock,
                                        &alternate_shallow_file,
                                        &extra);
                setup_alternate_shallow(&shallow_lock,
                                        &alternate_shallow_file,
                                        &extra);

diff --git a/fsck.c b/fsck.c
index 8f41e692bbf21913e5c9ee7a2b2c7b1361c3472c..6682de1de569b812e665e0748ce20a28293888c7 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -156,7 +156,7 @@ static void init_skiplist(struct fsck_options *options, const char *path)
                        break;
                if (parse_oid_hex(buffer, &oid, &p) || *p != '\n')
                        die("Invalid SHA-1: %s", buffer);
                        break;
                if (parse_oid_hex(buffer, &oid, &p) || *p != '\n')
                        die("Invalid SHA-1: %s", buffer);

-               sha1_array_append(&skiplist, oid.hash);
+               sha1_array_append(&skiplist, &oid);

                if (sorted && skiplist.nr > 1 &&
                                oidcmp(&skiplist.oid[skiplist.nr - 2],
                                       &oid) > 0)
                if (sorted && skiplist.nr > 1 &&
                                oidcmp(&skiplist.oid[skiplist.nr - 2],
                                       &oid) > 0)

diff --git a/parse-options-cb.c b/parse-options-cb.c
index 40ece4d8c21b2b2bd399c19edc5d106d188f94a5..7baecdc86425f978e896554b823f435a62caad1b 100644 (file)
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -106,7 +106,7 @@ int parse_opt_object_name(const struct option *opt, const char *arg, int unset)
                return -1;
        if (get_oid(arg, &oid))
                return error(_("malformed object name '%s'"), arg);
                return -1;
        if (get_oid(arg, &oid))
                return error(_("malformed object name '%s'"), arg);

-       sha1_array_append(opt->value, oid.hash);
+       sha1_array_append(opt->value, &oid);

        return 0;
 }
 
        return 0;
 }
 

diff --git a/sha1-array.c b/sha1-array.c
index 093d1580033f0059bf7889fafcb7f9086c4398d9..26e596b26437b19e17351fa10e111494eae2b1b4 100644 (file)
--- a/sha1-array.c
+++ b/sha1-array.c
@@ -2,10 +2,10 @@
 #include "sha1-array.h"
 #include "sha1-lookup.h"
 
 #include "sha1-array.h"
 #include "sha1-lookup.h"
 

-void sha1_array_append(struct sha1_array *array, const unsigned char *sha1)
+void sha1_array_append(struct sha1_array *array, const struct object_id *oid)

 {
        ALLOC_GROW(array->oid, array->nr + 1, array->alloc);
 {
        ALLOC_GROW(array->oid, array->nr + 1, array->alloc);

-       hashcpy(array->oid[array->nr++].hash, sha1);
+       oidcpy(&array->oid[array->nr++], oid);

        array->sorted = 0;
 }
 
        array->sorted = 0;
 }
 

diff --git a/sha1-array.h b/sha1-array.h
index c1f706acba36cef73b80747d1378911aa561ebc9..4e60576a8247f7b5006d7fdae2baba56afb2966c 100644 (file)
--- a/sha1-array.h
+++ b/sha1-array.h
@@ -10,7 +10,7 @@ struct sha1_array {
 
 #define SHA1_ARRAY_INIT { NULL, 0, 0, 0 }
 
 
 #define SHA1_ARRAY_INIT { NULL, 0, 0, 0 }
 

-void sha1_array_append(struct sha1_array *array, const unsigned char *sha1);
+void sha1_array_append(struct sha1_array *array, const struct object_id *oid);

 int sha1_array_lookup(struct sha1_array *array, const unsigned char *sha1);
 void sha1_array_clear(struct sha1_array *array);
 
 int sha1_array_lookup(struct sha1_array *array, const unsigned char *sha1);
 void sha1_array_clear(struct sha1_array *array);
 

diff --git a/sha1_name.c b/sha1_name.c
index 2e38aedfa5005f4ac955fea0f88f5c5777b4858b..1316832d730625621f3c7daa9af9640062c71039 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -428,7 +428,7 @@ static int get_short_sha1(const char *name, int len, unsigned char *sha1,
 
 static int collect_ambiguous(const struct object_id *oid, void *data)
 {
 
 static int collect_ambiguous(const struct object_id *oid, void *data)
 {

-       sha1_array_append(data, oid->hash);
+       sha1_array_append(data, oid);

        return 0;
 }
 
        return 0;
 }
 

diff --git a/submodule.c b/submodule.c
index 5c5c18ec3de14b2926e86789491751bfa72895a5..7912cba4f687d988c07328fde202fc9cfe46f62a 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -650,7 +650,7 @@ static void collect_submodules_from_diff(struct diff_queue_struct *q,
                if (!S_ISGITLINK(p->two->mode))
                        continue;
                commits = submodule_commits(submodules, p->two->path);
                if (!S_ISGITLINK(p->two->mode))
                        continue;
                commits = submodule_commits(submodules, p->two->path);

-               sha1_array_append(commits, p->two->oid.hash);
+               sha1_array_append(commits, &p->two->oid);

        }
 }
 
        }
 }
 


@@ -817,7 +817,7 @@ static void submodule_collect_changed_cb(struct diff_queue_struct *q,
 static int add_sha1_to_array(const char *ref, const struct object_id *oid,
                             int flags, void *data)
 {
 static int add_sha1_to_array(const char *ref, const struct object_id *oid,
                             int flags, void *data)
 {

-       sha1_array_append(data, oid->hash);
+       sha1_array_append(data, oid);

        return 0;
 }
 
        return 0;
 }
 


@@ -828,7 +828,7 @@ void check_for_new_submodule_commits(struct object_id *oid)
                initialized_fetch_ref_tips = 1;
        }
 
                initialized_fetch_ref_tips = 1;
        }
 

-       sha1_array_append(&ref_tips_after_fetch, oid->hash);
+       sha1_array_append(&ref_tips_after_fetch, oid);

 }
 
 static int add_sha1_to_argv(const unsigned char sha1[20], void *data)
 }
 
 static int add_sha1_to_argv(const unsigned char sha1[20], void *data)

diff --git a/t/helper/test-sha1-array.c b/t/helper/test-sha1-array.c
index b4bb97fcccc28ab0e2b2949992a52e00878b254d..181c36e0a54ef9cf8d89931e1826b1b5b1a5bdd5 100644 (file)
--- a/t/helper/test-sha1-array.c
+++ b/t/helper/test-sha1-array.c
@@ -19,7 +19,7 @@ int cmd_main(int argc, const char **argv)
                if (skip_prefix(line.buf, "append ", &arg)) {
                        if (get_oid_hex(arg, &oid))
                                die("not a hexadecimal SHA1: %s", arg);
                if (skip_prefix(line.buf, "append ", &arg)) {
                        if (get_oid_hex(arg, &oid))
                                die("not a hexadecimal SHA1: %s", arg);

-                       sha1_array_append(&array, oid.hash);
+                       sha1_array_append(&array, &oid);

                } else if (skip_prefix(line.buf, "lookup ", &arg)) {
                        if (get_oid_hex(arg, &oid))
                                die("not a hexadecimal SHA1: %s", arg);
                } else if (skip_prefix(line.buf, "lookup ", &arg)) {
                        if (get_oid_hex(arg, &oid))
                                die("not a hexadecimal SHA1: %s", arg);

diff --git a/transport.c b/transport.c
index 8a90b0c29b1557b631b6f679add93261f8288f7e..e492757726a7bd1567ad01958f9d920d37c39dd2 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1027,7 +1027,8 @@ int transport_push(struct transport *transport,
 
                        for (; ref; ref = ref->next)
                                if (!is_null_oid(&ref->new_oid))
 
                        for (; ref; ref = ref->next)
                                if (!is_null_oid(&ref->new_oid))

-                                       sha1_array_append(&commits, ref->new_oid.hash);
+                                       sha1_array_append(&commits,
+                                                         &ref->new_oid);

 
                        if (!push_unpushed_submodules(&commits,
                                                      transport->remote->name,
 
                        if (!push_unpushed_submodules(&commits,
                                                      transport->remote->name,


@@ -1048,7 +1049,8 @@ int transport_push(struct transport *transport,
 
                        for (; ref; ref = ref->next)
                                if (!is_null_oid(&ref->new_oid))
 
                        for (; ref; ref = ref->next)
                                if (!is_null_oid(&ref->new_oid))

-                                       sha1_array_append(&commits, ref->new_oid.hash);
+                                       sha1_array_append(&commits,
+                                                         &ref->new_oid);

 
                        if (find_unpushed_submodules(&commits, transport->remote->name,
                                                &needs_pushing)) {
 
                        if (find_unpushed_submodules(&commits, transport->remote->name,
                                                &needs_pushing)) {