commit: convert read_graft_file to handle arbitrary repositories

bmwill · gitster · commit d0e5dd0ed49a · 2018-05-18T08:13:10.000+09:00
Signed-off-by: Brandon Williams &lt;bmwill@google.com&gt;
Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,7 @@ struct commit_graft read_graft_line(struct strbuf line)`
`177`	`177`	`return NULL;`
`178`	`178`	`}`
`179`	`179`
`180`		`-#define read_graft_file(r, f) read_graft_file_##r(f)`
`181`		`-static int read_graft_file_the_repository(const char *graft_file)`
	`180`	`+static int read_graft_file(struct repository r, const char graft_file)`
`182`	`181`	`{`
`183`	`182`	`FILE *fp = fopen_or_warn(graft_file, "r");`
`184`	`183`	`struct strbuf buf = STRBUF_INIT;`
`@@ -189,7 +188,7 @@ static int read_graft_file_the_repository(const char *graft_file)`
`189`	`188`	`struct commit_graft *graft = read_graft_line(&buf);`
`190`	`189`	`if (!graft)`
`191`	`190`	`continue;`
`192`		`- if (register_commit_graft(the_repository, graft, 1))`
	`191`	`+ if (register_commit_graft(r, graft, 1))`
`193`	`192`	`error("duplicate graft data: %s", buf.buf);`
`194`	`193`	`}`
`195`	`194`	`fclose(fp);`