Merge branch 'nd/stop-setenv-work-tree' into nd/clear-gitenv-upon-use-of-alias

diff --git a/commit.c b/commit.c
index 0eee4107647c1fd0246b3c8d2e45a103ded844e5..6e2103cef60e8a0c2df18685280dbb5fda5c133f 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)
 {
-       unsigned char sha1[20];
+       struct object_id oid;
        struct commit *commit;
 
-       if (get_sha1_committish(name, sha1))
+       if (get_sha1_committish(name, oid.hash))
                return NULL;
-       commit = lookup_commit_reference(sha1);
+       commit = lookup_commit_reference(oid.hash);
        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;
-       return commit_graft_table[index]->sha1;
+       return commit_graft_table[index]->oid.hash;
 }
 
 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 pos = commit_graft_pos(graft->sha1);
+       int pos = commit_graft_pos(graft->oid.hash);
 
        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;
+       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;
-       if ((len + 1) % 41)
+       if ((len + 1) % entry_size)
                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;
-       if (get_sha1_hex(buf, graft->sha1))
+       if (get_oid_hex(buf, &graft->oid))
                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 (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;
@@ -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;
-       unsigned char parent[20];
+       struct object_id parent;
        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 (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));
-       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));
-       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);
-       while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
+       while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
                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));
-               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;
-               new_parent = lookup_commit(parent);
+               new_parent = lookup_commit(parent.hash);
                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++) {
-                       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;
@@ -1581,10 +1585,10 @@ struct commit *get_merge_parent(const char *name)
 {
        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;
-       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;