[PATCH 5/5] commit: rewrite read_graft_line
- From
Patryk Obara <patryk.obara@gmail.com>
- Date
- Aug 15, 2017, 11:49 UTC
- Message-ID
- <ee8edaf08864d5983ff1a5150077d29a4ee17796.1502796628.git.patryk.obara@gmail.com>
- In-Reply-To
- <cover.1502796628.git.patryk.obara@gmail.com>
The previous implementation of read_graft_line used calculations based on GIT_SHA1_RAWSZ and GIT_SHA1_HEXSZ to determine the number of commit ids in a single graft line. New implementation does not depend on these constants, so it adapts to any object_id buffer size.
To make this possible, FLEX_ARRAY of object_id in struct was replaced by an oid_array.
Code allocating graft now needs to use memset to zero the memory before use to start with oid_array in a consistent state.
Updates free_graft function implemented in the previous patch to properly cleanup an oid_array storing parents.
Signed-off-by: Patryk Obara <patryk.obara@gmail.com> --- commit.c | 39 +++++++++++++++++++++------------------ commit.h | 2 +- shallow.c | 1 + 3 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/commit.c b/commit.c index 6a145f1..75dd45d 100644 --- a/commit.c +++ b/commit.c @@ -111,6 +111,7 @@ static int commit_graft_pos(const unsigned char *sha1) void free_commit_graft(struct commit_graft *graft) { + oid_array_clear(&graft->parents); free(graft); } @@ -139,35 +140,37 @@ int register_commit_graft(struct commit_graft *graft, int ignore_dups) return 0; } +static int parse_next_oid_hex(const char *buf, struct object_id *oid, const char **end) +{ + while (isspace(buf[0])) + buf++; + return parse_oid_hex(buf, oid, end); +} + struct commit_graft *read_graft_line(struct strbuf *line) { /* The format is just "Commit Parent1 Parent2 ...\n" */ - int i, len; - char *buf = line->buf; struct commit_graft *graft = NULL; - const int entry_size = GIT_SHA1_HEXSZ + 1; + struct object_id oid; + const char *tail = NULL; strbuf_rtrim(line); - len = line->len; - if (buf[0] == '#' || buf[0] == '\0') + if (line->buf[0] == '#' || line->len == 0) return NULL; - if ((len + 1) % entry_size) + graft = xmalloc(sizeof(*graft)); + memset(graft, 0, sizeof(*graft)); + if (parse_oid_hex(line->buf, &graft->oid, &tail)) goto bad_graft_data; - i = (len + 1) / entry_size - 1; - graft = xmalloc(st_add(sizeof(*graft), st_mult(GIT_SHA1_RAWSZ, i))); - graft->nr_parent = i; - if (get_oid_hex(buf, &graft->oid)) + while (!parse_next_oid_hex(tail, &oid, &tail)) + oid_array_append(&graft->parents, &oid); + if (tail[0] != '\0') goto bad_graft_data; - 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/entry_size].hash)) - goto bad_graft_data; - } + graft->nr_parent = graft->parents.nr; + return graft; bad_graft_data: - error("bad graft data: %s", buf); + error("bad graft data: %s", line->buf); free_commit_graft(graft); return NULL; } @@ -363,7 +366,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->parents.oid[i]); if (!new_parent) continue; pptr = &commit_list_insert(new_parent, pptr)->next; diff --git a/commit.h b/commit.h index c1b319f..070d45d 100644 --- a/commit.h +++ b/commit.h @@ -243,7 +243,7 @@ void sort_in_topological_order(struct commit_list **, enum rev_sort_order); struct commit_graft { struct object_id oid; int nr_parent; /* < 0 if shallow commit */ - struct object_id parent[FLEX_ARRAY]; /* more */ + struct oid_array parents; }; typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *); diff --git a/shallow.c b/shallow.c index f5591e5..892cd90 100644 --- a/shallow.c +++ b/shallow.c @@ -33,6 +33,7 @@ int register_shallow(const struct object_id *oid) xmalloc(sizeof(struct commit_graft)); struct commit *commit = lookup_commit(oid); + memset(graft, 0, sizeof(*graft)); oidcpy(&graft->oid, oid); graft->nr_parent = -1; if (commit && commit->object.parsed)
-- 2.9.5