@matheusbsbs / matheus-bagliano / commits / 08f4f44501

commit: add repository argument to parse_commit_buffer

Add a repository argument to allow the callers of parse_commit_buffer to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Stefan Beller committed Jun 28, 2018 at 18:22 UTC 08f4f44501bef21e10a1a449b8ba2d2710835b48

4 files changed +6 -5

commit.c

+2 -2

@@ -363,7 +363,7 @@ const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)

363 return ret;

364 }

365

366 -int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size, int check_graph)

366 +int parse_commit_buffer_the_repository(struct commit *item, const void *buffer, unsigned long size, int check_graph)

367 {

368 const char *tail = buffer;

369 const char *bufptr = buffer;

@@ -448,7 +448,7 @@ int parse_commit_gently(struct commit *item, int quiet_on_missing)

448 return error("Object %s not a commit",

449 oid_to_hex(&item->object.oid));

450 }

451 - ret = parse_commit_buffer(item, buffer, size, 0);

451 + ret = parse_commit_buffer(the_repository, item, buffer, size, 0);

452 if (save_commit_buffer && !ret) {

453 set_commit_buffer(item, buffer, size);

454 return 0;

commit.h

+2 -1

@@ -82,7 +82,8 @@ struct commit *lookup_commit_reference_by_name(const char *name);

82 */

83 struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name);

85 -int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size, int check_graph);

85 +#define parse_commit_buffer(r, i, b, s, g) parse_commit_buffer_##r(i, b, s, g)

86 +int parse_commit_buffer_the_repository(struct commit *item, const void *buffer, unsigned long size, int check_graph);

87 int parse_commit_gently(struct commit *item, int quiet_on_missing);

88 static inline int parse_commit(struct commit *item)

89 {

object.c

+1 -1

@@ -214,7 +214,7 @@ struct object *parse_object_buffer_the_repository(const struct object_id *oid, e

214 } else if (type == OBJ_COMMIT) {

215 struct commit *commit = lookup_commit(the_repository, oid);

216 if (commit) {

217 - if (parse_commit_buffer(commit, buffer, size, 1))

217 + if (parse_commit_buffer(the_repository, commit, buffer, size, 1))

218 return NULL;

219 if (!get_cached_commit_buffer(commit, NULL)) {

220 set_commit_buffer(commit, buffer, size);

sha1-file.c

+1 -1

@@ -1801,7 +1801,7 @@ static void check_commit(const void *buf, size_t size)

1801 {

1802 struct commit c;

1803 memset(&c, 0, sizeof(c));

1804 - if (parse_commit_buffer(&c, buf, size, 0))

1804 + if (parse_commit_buffer(the_repository, &c, buf, size, 0))

1805 die("corrupt commit");

1806 }

1807