[PATCH 14/19] commit: convert read_graft_file to handle arbitrary repositories
From: Stefan Beller <hidden>
Date: 2018-05-15 23:43:20
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Brandon Williams <redacted> Signed-off-by: Brandon Williams <redacted> Signed-off-by: Stefan Beller <redacted> --- commit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/commit.c b/commit.c
index 8a2ab53fc67..3fcb2fd66ce 100644
--- a/commit.c
+++ b/commit.c@@ -177,8 +177,7 @@ struct commit_graft *read_graft_line(struct strbuf *line) 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;
@@ -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; - if (register_commit_graft(the_repository, graft, 1)) + if (register_commit_graft(r, graft, 1)) error("duplicate graft data: %s", buf.buf); } fclose(fp);
--
2.17.0.582.gccdcbd54c44.dirty