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>

diff --git a/commit.c b/commit.c
index 4803c8be1df37bddba36a877ba67354c87b324f0..75d0bdede84d413c820fa589fe79c2d83d63bb34 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -363,7 +363,7 @@ const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)
        return ret;
 }
 
        return ret;
 }
 

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

 {
        const char *tail = buffer;
        const char *bufptr = buffer;
 {
        const char *tail = buffer;
        const char *bufptr = buffer;


@@ -448,7 +448,7 @@ int parse_commit_gently(struct commit *item, int quiet_on_missing)
                return error("Object %s not a commit",
                             oid_to_hex(&item->object.oid));
        }
                return error("Object %s not a commit",
                             oid_to_hex(&item->object.oid));
        }

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

        if (save_commit_buffer && !ret) {
                set_commit_buffer(item, buffer, size);
                return 0;
        if (save_commit_buffer && !ret) {
                set_commit_buffer(item, buffer, size);
                return 0;

diff --git a/commit.h b/commit.h
index cd80dab59c1fb0969f87f9e33687192c5aa8141b..f326c13622b588dd4c2410abfb88ea7ffcf7e0b3 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -82,7 +82,8 @@ struct commit *lookup_commit_reference_by_name(const char *name);
  */
 struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name);
 
  */
 struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name);
 

-int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size, int check_graph);
+#define parse_commit_buffer(r, i, b, s, g) parse_commit_buffer_##r(i, b, s, g)
+int parse_commit_buffer_the_repository(struct commit *item, const void *buffer, unsigned long size, int check_graph);

 int parse_commit_gently(struct commit *item, int quiet_on_missing);
 static inline int parse_commit(struct commit *item)
 {
 int parse_commit_gently(struct commit *item, int quiet_on_missing);
 static inline int parse_commit(struct commit *item)
 {

diff --git a/object.c b/object.c
index 530c55e41e42ed192e9e86c32ea815e2812ef2c2..5494c0cbaa1f51c6b87c05dfc1346d6c1c15eb16 100644 (file)
--- a/object.c
+++ b/object.c
@@ -214,7 +214,7 @@ struct object *parse_object_buffer_the_repository(const struct object_id *oid, e
        } else if (type == OBJ_COMMIT) {
                struct commit *commit = lookup_commit(the_repository, oid);
                if (commit) {
        } else if (type == OBJ_COMMIT) {
                struct commit *commit = lookup_commit(the_repository, oid);
                if (commit) {

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

                                return NULL;
                        if (!get_cached_commit_buffer(commit, NULL)) {
                                set_commit_buffer(commit, buffer, size);
                                return NULL;
                        if (!get_cached_commit_buffer(commit, NULL)) {
                                set_commit_buffer(commit, buffer, size);

diff --git a/sha1-file.c b/sha1-file.c
index de4839e634c02cb7497f05a3a4597b9fa5123e32..75ba30b4ab1b862581da7b8d27ccc0869fc3a310 100644 (file)
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -1801,7 +1801,7 @@ static void check_commit(const void *buf, size_t size)
 {
        struct commit c;
        memset(&c, 0, sizeof(c));
 {
        struct commit c;
        memset(&c, 0, sizeof(c));

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

                die("corrupt commit");
 }
 
                die("corrupt commit");
 }