commit: convert parts to struct object_id

Convert struct commit_graft and necessary local parts of commit.c.
Also, convert several constants based on the hex length of an SHA-1 to
use GIT_SHA1_HEXSZ, and move several magic constants into variables for
readability.

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

diff --git a/commit.c b/commit.c
index a8c7577d28a4b2a0b5fc13420f8a141871626087..2d9de807aeb230c97e74928c1b446544186bc4e1 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -55,12 +55,12 @@ struct commit *lookup_commit(const unsigned char *sha1)
 
 struct commit *lookup_commit_reference_by_name(const char *name)
 {
 
 struct commit *lookup_commit_reference_by_name(const char *name)
 {

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

        struct commit *commit;
 
        struct commit *commit;
 

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

                return NULL;
                return NULL;

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

        if (parse_commit(commit))
                return NULL;
        return commit;
        if (parse_commit(commit))
                return NULL;
        return commit;


@@ -99,7 +99,7 @@ static int commit_graft_alloc, commit_graft_nr;
 static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
 {
        struct commit_graft **commit_graft_table = table;
 static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
 {
        struct commit_graft **commit_graft_table = table;

-       return commit_graft_table[index]->sha1;
+       return commit_graft_table[index]->oid.hash;

 }
 
 static int commit_graft_pos(const unsigned char *sha1)
 }
 
 static int commit_graft_pos(const unsigned char *sha1)


@@ -110,7 +110,7 @@ static int commit_graft_pos(const unsigned char *sha1)
 
 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
 {
 
 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
 {

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

 
        if (0 <= pos) {
                if (ignore_dups)
 
        if (0 <= pos) {
                if (ignore_dups)


@@ -138,22 +138,23 @@ struct commit_graft *read_graft_line(char *buf, int len)
        /* The format is just "Commit Parent1 Parent2 ...\n" */
        int i;
        struct commit_graft *graft = NULL;
        /* The format is just "Commit Parent1 Parent2 ...\n" */
        int i;
        struct commit_graft *graft = NULL;

+       const int entry_size = GIT_SHA1_HEXSZ + 1;

 
        while (len && isspace(buf[len-1]))
                buf[--len] = '\0';
        if (buf[0] == '#' || buf[0] == '\0')
                return NULL;
 
        while (len && isspace(buf[len-1]))
                buf[--len] = '\0';
        if (buf[0] == '#' || buf[0] == '\0')
                return NULL;

-       if ((len + 1) % 41)
+       if ((len + 1) % entry_size)

                goto bad_graft_data;
                goto bad_graft_data;

-       i = (len + 1) / 41 - 1;
-       graft = xmalloc(sizeof(*graft) + 20 * i);
+       i = (len + 1) / entry_size - 1;
+       graft = xmalloc(sizeof(*graft) + GIT_SHA1_RAWSZ * i);

        graft->nr_parent = i;
        graft->nr_parent = i;

-       if (get_sha1_hex(buf, graft->sha1))
+       if (get_oid_hex(buf, &graft->oid))

                goto bad_graft_data;
                goto bad_graft_data;

-       for (i = 40; i < len; i += 41) {
+       for (i = GIT_SHA1_HEXSZ; i < len; i += entry_size) {

                if (buf[i] != ' ')
                        goto bad_graft_data;
                if (buf[i] != ' ')
                        goto bad_graft_data;

-               if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
+               if (get_sha1_hex(buf + i + 1, graft->parent[i/entry_size].hash))

                        goto bad_graft_data;
        }
        return graft;
                        goto bad_graft_data;
        }
        return graft;


@@ -302,39 +303,42 @@ int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long s
 {
        const char *tail = buffer;
        const char *bufptr = buffer;
 {
        const char *tail = buffer;
        const char *bufptr = buffer;

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

        struct commit_list **pptr;
        struct commit_graft *graft;
        struct commit_list **pptr;
        struct commit_graft *graft;

+       const int tree_entry_len = GIT_SHA1_HEXSZ + 5;
+       const int parent_entry_len = GIT_SHA1_HEXSZ + 7;

 
        if (item->object.parsed)
                return 0;
        item->object.parsed = 1;
        tail += size;
 
        if (item->object.parsed)
                return 0;
        item->object.parsed = 1;
        tail += size;

-       if (tail <= bufptr + 46 || memcmp(bufptr, "tree ", 5) || bufptr[45] != '\n')
+       if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
+                       bufptr[tree_entry_len] != '\n')

                return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
                return error("bogus commit object %s", sha1_to_hex(item->object.sha1));

-       if (get_sha1_hex(bufptr + 5, parent) < 0)
+       if (get_sha1_hex(bufptr + 5, parent.hash) < 0)

                return error("bad tree pointer in commit %s",
                             sha1_to_hex(item->object.sha1));
                return error("bad tree pointer in commit %s",
                             sha1_to_hex(item->object.sha1));

-       item->tree = lookup_tree(parent);
-       bufptr += 46; /* "tree " + "hex sha1" + "\n" */
+       item->tree = lookup_tree(parent.hash);
+       bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */

        pptr = &item->parents;
 
        graft = lookup_commit_graft(item->object.sha1);
        pptr = &item->parents;
 
        graft = lookup_commit_graft(item->object.sha1);

-       while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
+       while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {

                struct commit *new_parent;
 
                struct commit *new_parent;
 

-               if (tail <= bufptr + 48 ||
-                   get_sha1_hex(bufptr + 7, parent) ||
-                   bufptr[47] != '\n')
+               if (tail <= bufptr + parent_entry_len + 1 ||
+                   get_sha1_hex(bufptr + 7, parent.hash) ||
+                   bufptr[parent_entry_len] != '\n')

                        return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
                        return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));

-               bufptr += 48;
+               bufptr += parent_entry_len + 1;

                /*
                 * The clone is shallow if nr_parent < 0, and we must
                 * not traverse its real parents even when we unhide them.
                 */
                if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
                        continue;
                /*
                 * The clone is shallow if nr_parent < 0, and we must
                 * not traverse its real parents even when we unhide them.
                 */
                if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
                        continue;

-               new_parent = lookup_commit(parent);
+               new_parent = lookup_commit(parent.hash);

                if (new_parent)
                        pptr = &commit_list_insert(new_parent, pptr)->next;
        }
                if (new_parent)
                        pptr = &commit_list_insert(new_parent, pptr)->next;
        }


@@ -342,7 +346,7 @@ int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long s
                int i;
                struct commit *new_parent;
                for (i = 0; i < graft->nr_parent; i++) {
                int i;
                struct commit *new_parent;
                for (i = 0; i < graft->nr_parent; i++) {

-                       new_parent = lookup_commit(graft->parent[i]);
+                       new_parent = lookup_commit(graft->parent[i].hash);

                        if (!new_parent)
                                continue;
                        pptr = &commit_list_insert(new_parent, pptr)->next;
                        if (!new_parent)
                                continue;
                        pptr = &commit_list_insert(new_parent, pptr)->next;


@@ -1580,10 +1584,10 @@ struct commit *get_merge_parent(const char *name)
 {
        struct object *obj;
        struct commit *commit;
 {
        struct object *obj;
        struct commit *commit;

-       unsigned char sha1[20];
-       if (get_sha1(name, sha1))
+       struct object_id oid;
+       if (get_sha1(name, oid.hash))

                return NULL;
                return NULL;

-       obj = parse_object(sha1);
+       obj = parse_object(oid.hash);

        commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
        if (commit && !commit->util) {
                struct merge_remote_desc *desc;
        commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
        if (commit && !commit->util) {
                struct merge_remote_desc *desc;

diff --git a/commit.h b/commit.h
index 5cc1e7ec9ee80965d1669e0f96dfeab03f3b0798..896272abcfcc99aaf26b4d4d7d832d7e653b654c 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -226,9 +226,9 @@ enum rev_sort_order {
 void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
 
 struct commit_graft {
 void sort_in_topological_order(struct commit_list **, enum rev_sort_order);
 
 struct commit_graft {

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

        int nr_parent; /* < 0 if shallow commit */
        int nr_parent; /* < 0 if shallow commit */

-       unsigned char parent[FLEX_ARRAY][20]; /* more */
+       struct object_id parent[FLEX_ARRAY]; /* more */

 };
 typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
 
 };
 typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
 

diff --git a/log-tree.c b/log-tree.c
index 7f0890e4ac14348e78f7f1e305629fa745a79392..51cc695ae5dfe284c486069c25a624840a2ce490 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -137,7 +137,7 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in
 
 static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
 {
 
 static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
 {

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

        if (!commit)
                return 0;
        add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object);
        if (!commit)
                return 0;
        add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object);

diff --git a/send-pack.c b/send-pack.c
index 25947d7df9dd3af6e665d5d5eb63ec970617aef1..fa7701b8ff9f95c3101480a677a91d0aedfbd76e 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -182,7 +182,7 @@ static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *c
 {
        struct strbuf *sb = cb;
        if (graft->nr_parent == -1)
 {
        struct strbuf *sb = cb;
        if (graft->nr_parent == -1)

-               packet_buf_write(sb, "shallow %s\n", sha1_to_hex(graft->sha1));
+               packet_buf_write(sb, "shallow %s\n", oid_to_hex(&graft->oid));

        return 0;
 }
 
        return 0;
 }
 

diff --git a/shallow.c b/shallow.c
index f5e67204a4084ff79beec0d5a5dd0fb06966cc3f..24872034ef5b104049a96f485851fa49d0deefc9 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -31,7 +31,7 @@ int register_shallow(const unsigned char *sha1)
                xmalloc(sizeof(struct commit_graft));
        struct commit *commit = lookup_commit(sha1);
 
                xmalloc(sizeof(struct commit_graft));
        struct commit *commit = lookup_commit(sha1);
 

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

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


@@ -159,11 +159,11 @@ struct write_shallow_data {
 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
 {
        struct write_shallow_data *data = cb_data;
 static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
 {
        struct write_shallow_data *data = cb_data;

-       const char *hex = sha1_to_hex(graft->sha1);
+       const char *hex = oid_to_hex(&graft->oid);

        if (graft->nr_parent != -1)
                return 0;
        if (data->flags & SEEN_ONLY) {
        if (graft->nr_parent != -1)
                return 0;
        if (data->flags & SEEN_ONLY) {

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

                if (!c || !(c->object.flags & SEEN)) {
                        if (data->flags & VERBOSE)
                                printf("Removing %s from .git/shallow\n",
                if (!c || !(c->object.flags & SEEN)) {
                        if (data->flags & VERBOSE)
                                printf("Removing %s from .git/shallow\n",


@@ -282,7 +282,7 @@ static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *c
 {
        int fd = *(int *)cb;
        if (graft->nr_parent == -1)
 {
        int fd = *(int *)cb;
        if (graft->nr_parent == -1)

-               packet_write(fd, "shallow %s\n", sha1_to_hex(graft->sha1));
+               packet_write(fd, "shallow %s\n", oid_to_hex(&graft->oid));

        return 0;
 }
 
        return 0;
 }
 

diff --git a/upload-pack.c b/upload-pack.c
index b531a325d2864e94bdc86e689f78663255bb7cf2..0566ce04b933dd5cb631646fb47f9844da43e94f 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -74,7 +74,7 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
 {
        FILE *fp = cb_data;
        if (graft->nr_parent == -1)
 {
        FILE *fp = cb_data;
        if (graft->nr_parent == -1)

-               fprintf(fp, "--shallow %s\n", sha1_to_hex(graft->sha1));
+               fprintf(fp, "--shallow %s\n", oid_to_hex(&graft->oid));

        return 0;
 }
 
        return 0;
 }