[PATCH 097/194] object: add repository argument to prepare_commit_graft
- From
Stefan Beller <sbeller@google.com>
- Date
- Feb 5, 2018, 23:55 UTC
- Message-ID
- <20180205235735.216710-77-sbeller@google.com>
- In-Reply-To
- <20180205235735.216710-1-sbeller@google.com>
From: Jonathan Nieder <jrnieder@gmail.com>
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 <jrnieder@gmail.com> Signed-off-by: Stefan Beller <sbeller@google.com> --- commit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/commit.c b/commit.c index d2c6367f85..fbe27cf436 100644 --- a/commit.c +++ b/commit.c @@ -198,7 +198,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; @@ -215,7 +216,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.15.1.433.g936d1b9894.dirty