shallow: convert shallow registration functions to object_id

Convert register_shallow and unregister_shallow to take struct
object_id.  register_shallow is a caller of lookup_commit, which we will
convert later.  It doesn't make sense for the registration and
unregistration functions to have incompatible interfaces, so convert
them both.

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

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 0fe35d1b5aebd74116d66d5414bdabf19baf7d97..4770708063e73646cceadf33e3766a2d3a78f338 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2777,10 +2777,10 @@ static void get_object_list(int ac, const char **av)
                                continue;
                        }
                        if (starts_with(line, "--shallow ")) {
                                continue;
                        }
                        if (starts_with(line, "--shallow ")) {

-                               unsigned char sha1[20];
-                               if (get_sha1_hex(line + 10, sha1))
+                               struct object_id oid;
+                               if (get_oid_hex(line + 10, &oid))

                                        die("not an SHA-1 '%s'", line + 10);
                                        die("not an SHA-1 '%s'", line + 10);

-                               register_shallow(sha1);
+                               register_shallow(&oid);

                                use_bitmap_index = 0;
                                continue;
                        }
                                use_bitmap_index = 0;
                                continue;
                        }

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index f96834f42c9849746b64c20c84869232cbac7367..6f0f788b0cb9fd0174ce9572843e43e69e27a131 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -858,7 +858,7 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
         * not lose these new roots..
         */
        for (i = 0; i < extra.nr; i++)
         * not lose these new roots..
         */
        for (i = 0; i < extra.nr; i++)

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

 
        si->shallow_ref[cmd->index] = 0;
        oid_array_clear(&extra);
 
        si->shallow_ref[cmd->index] = 0;
        oid_array_clear(&extra);

diff --git a/commit.c b/commit.c
index 73c78c2b80c1a21e83f1942347a76fb76511a0d3..ec41ba5e09f2b0fb7204219f00f3af85537b20cd 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -216,9 +216,9 @@ int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
        return ret;
 }
 
        return ret;
 }
 

-int unregister_shallow(const unsigned char *sha1)
+int unregister_shallow(const struct object_id *oid)

 {
 {

-       int pos = commit_graft_pos(sha1);
+       int pos = commit_graft_pos(oid->hash);

        if (pos < 0)
                return -1;
        if (pos + 1 < commit_graft_nr)
        if (pos < 0)
                return -1;
        if (pos + 1 < commit_graft_nr)

diff --git a/commit.h b/commit.h
index 7b1986d5c8a0120ea90ee485ba46aff912de60fa..884177b8fa8b035cf76f03c9a9fa9044b78e4a6f 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -263,8 +263,8 @@ extern struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n,
 
 struct oid_array;
 struct ref;
 
 struct oid_array;
 struct ref;

-extern int register_shallow(const unsigned char *sha1);
-extern int unregister_shallow(const unsigned char *sha1);
+extern int register_shallow(const struct object_id *oid);
+extern int unregister_shallow(const struct object_id *oid);

 extern int for_each_commit_graft(each_commit_graft_fn, void *);
 extern int is_repository_shallow(void);
 extern struct commit_list *get_shallow_commits(struct object_array *heads,
 extern int for_each_commit_graft(each_commit_graft_fn, void *);
 extern int is_repository_shallow(void);
 extern struct commit_list *get_shallow_commits(struct object_array *heads,

diff --git a/fetch-pack.c b/fetch-pack.c
index b42d01f422807a4ff7bead2d0642b45929fd45f9..d455ef97af276fdf7e7dbd78e62eef9d110e2d97 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -417,7 +417,7 @@ static int find_common(struct fetch_pack_args *args,
                        if (skip_prefix(line, "shallow ", &arg)) {
                                if (get_oid_hex(arg, &oid))
                                        die(_("invalid shallow line: %s"), line);
                        if (skip_prefix(line, "shallow ", &arg)) {
                                if (get_oid_hex(arg, &oid))
                                        die(_("invalid shallow line: %s"), line);

-                               register_shallow(oid.hash);
+                               register_shallow(&oid);

                                continue;
                        }
                        if (skip_prefix(line, "unshallow ", &arg)) {
                                continue;
                        }
                        if (skip_prefix(line, "unshallow ", &arg)) {


@@ -428,7 +428,7 @@ static int find_common(struct fetch_pack_args *args,
                                /* make sure that it is parsed as shallow */
                                if (!parse_object(oid.hash))
                                        die(_("error in object: %s"), line);
                                /* make sure that it is parsed as shallow */
                                if (!parse_object(oid.hash))
                                        die(_("error in object: %s"), line);

-                               if (unregister_shallow(oid.hash))
+                               if (unregister_shallow(&oid))

                                        die(_("no shallow found: %s"), line);
                                continue;
                        }
                                        die(_("no shallow found: %s"), line);
                                continue;
                        }

diff --git a/shallow.c b/shallow.c
index 25b6db989bf4ab475bd7fa224c63b753d61f586e..c520ae3aea1e9d041905e57eef938e70dac726db 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -27,13 +27,13 @@ void set_alternate_shallow_file(const char *path, int override)
        alternate_shallow_file = xstrdup_or_null(path);
 }
 
        alternate_shallow_file = xstrdup_or_null(path);
 }
 

-int register_shallow(const unsigned char *sha1)
+int register_shallow(const struct object_id *oid)

 {
        struct commit_graft *graft =
                xmalloc(sizeof(struct commit_graft));
 {
        struct commit_graft *graft =
                xmalloc(sizeof(struct commit_graft));

-       struct commit *commit = lookup_commit(sha1);
+       struct commit *commit = lookup_commit(oid->hash);

 
 

-       hashcpy(graft->oid.hash, sha1);
+       oidcpy(&graft->oid, oid);

        graft->nr_parent = -1;
        if (commit && commit->object.parsed)
                commit->parents = NULL;
        graft->nr_parent = -1;
        if (commit && commit->object.parsed)
                commit->parents = NULL;


@@ -65,10 +65,10 @@ int is_repository_shallow(void)
        is_shallow = 1;
 
        while (fgets(buf, sizeof(buf), fp)) {
        is_shallow = 1;
 
        while (fgets(buf, sizeof(buf), fp)) {

-               unsigned char sha1[20];
-               if (get_sha1_hex(buf, sha1))
+               struct object_id oid;
+               if (get_oid_hex(buf, &oid))

                        die("bad shallow line: %s", buf);
                        die("bad shallow line: %s", buf);

-               register_shallow(sha1);
+               register_shallow(&oid);

        }
        fclose(fp);
        return is_shallow;
        }
        fclose(fp);
        return is_shallow;

diff --git a/upload-pack.c b/upload-pack.c
index ffb028d6231e24877b5b6af616d0c3de59516d95..20f87cd383b5c382069323637f4b3f07b8361178 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -642,7 +642,7 @@ static void send_shallow(struct commit_list *result)
                if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
                        packet_write_fmt(1, "shallow %s",
                                         oid_to_hex(&object->oid));
                if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
                        packet_write_fmt(1, "shallow %s",
                                         oid_to_hex(&object->oid));

-                       register_shallow(object->oid.hash);
+                       register_shallow(&object->oid);

                        shallow_nr++;
                }
                result = result->next;
                        shallow_nr++;
                }
                result = result->next;


@@ -667,7 +667,7 @@ static void send_unshallow(const struct object_array *shallows)
                         * parse and add the parents to the want list, then
                         * re-register it.
                         */
                         * parse and add the parents to the want list, then
                         * re-register it.
                         */

-                       unregister_shallow(object->oid.hash);
+                       unregister_shallow(&object->oid);

                        object->parsed = 0;
                        parse_commit_or_die((struct commit *)object);
                        parents = ((struct commit *)object)->parents;
                        object->parsed = 0;
                        parse_commit_or_die((struct commit *)object);
                        parents = ((struct commit *)object)->parents;


@@ -679,7 +679,7 @@ static void send_unshallow(const struct object_array *shallows)
                        add_object_array(object, NULL, &extra_edge_obj);
                }
                /* make sure commit traversal conforms to client */
                        add_object_array(object, NULL, &extra_edge_obj);
                }
                /* make sure commit traversal conforms to client */

-               register_shallow(object->oid.hash);
+               register_shallow(&object->oid);

        }
 }
 
        }
 }
 


@@ -883,7 +883,7 @@ static void receive_needs(void)
                if (shallows.nr > 0) {
                        int i;
                        for (i = 0; i < shallows.nr; i++)
                if (shallows.nr > 0) {
                        int i;
                        for (i = 0; i < shallows.nr; i++)

-                               register_shallow(shallows.objects[i].item->oid.hash);
+                               register_shallow(&shallows.objects[i].item->oid);

                }
 
        shallow_nr += shallows.nr;
                }
 
        shallow_nr += shallows.nr;