[PATCH 06/19] commit: add repository argument to prepare_commit_graft
From: Stefan Beller <hidden>
Date: 2018-05-17 22:53:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Jonathan Nieder <redacted> Add a repository argument to allow the caller of prepare_commit_graft to be more specific about which repository to handle. 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 <redacted> Signed-off-by: Stefan Beller <redacted> Signed-off-by: Junio C Hamano <redacted> --- commit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/commit.c b/commit.c
index b5c0aec24a0..a0400b93a1e 100644
--- a/commit.c
+++ b/commit.c@@ -197,7 +197,8 @@ static int read_graft_file_the_repository(const char *graft_file) return 0; } -static void prepare_commit_graft(void) +#define prepare_commit_graft(r) prepare_commit_graft_##r() +static void prepare_commit_graft_the_repository(void) { static int commit_graft_prepared; char *graft_file;
@@ -214,7 +215,7 @@ static void prepare_commit_graft(void) struct commit_graft *lookup_commit_graft(const struct object_id *oid) { int pos; - prepare_commit_graft(); + prepare_commit_graft(the_repository); pos = commit_graft_pos(the_repository, oid->hash); if (pos < 0) return NULL;
--
2.17.0.582.gccdcbd54c44.dirty