commit: convert read_graft_file to handle arbitrary repositories

Signed-off-by: Brandon Williams <bmwill@google.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 8a2ab53fc67355ac8631b427e85f617cd90261ba..3fcb2fd66ce7fc57638f4dc0ba912995915fe70f 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -177,8 +177,7 @@ struct commit_graft *read_graft_line(struct strbuf *line)
        return NULL;
 }
 
        return NULL;
 }
 

-#define read_graft_file(r, f) read_graft_file_##r(f)
-static int read_graft_file_the_repository(const char *graft_file)
+static int read_graft_file(struct repository *r, const char *graft_file)

 {
        FILE *fp = fopen_or_warn(graft_file, "r");
        struct strbuf buf = STRBUF_INIT;
 {
        FILE *fp = fopen_or_warn(graft_file, "r");
        struct strbuf buf = STRBUF_INIT;


@@ -189,7 +188,7 @@ static int read_graft_file_the_repository(const char *graft_file)
                struct commit_graft *graft = read_graft_line(&buf);
                if (!graft)
                        continue;
                struct commit_graft *graft = read_graft_line(&buf);
                if (!graft)
                        continue;

-               if (register_commit_graft(the_repository, graft, 1))
+               if (register_commit_graft(r, graft, 1))

                        error("duplicate graft data: %s", buf.buf);
        }
        fclose(fp);
                        error("duplicate graft data: %s", buf.buf);
        }
        fclose(fp);