[PATCH 12/19] commit: convert commit_graft_pos() to handle arbitrary repositories
From: Brandon Williams <bmwill@google.com>
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
commit.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/commit.c b/commit.c
index 684eeaa2ccd..0ec3d22813a 100644
--- a/commit.c
+++ b/commit.c
@@ -104,11 +104,10 @@ static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
return commit_graft_table[index]->oid.hash;
}
-#define commit_graft_pos(r, s) commit_graft_pos_##r(s)
-static int commit_graft_pos_the_repository(const unsigned char *sha1)
+static int commit_graft_pos(struct repository *r, const unsigned char *sha1)
{
- return sha1_pos(sha1, the_repository->parsed_objects->grafts,
- the_repository->parsed_objects->grafts_nr,
+ return sha1_pos(sha1, r->parsed_objects->grafts,
+ r->parsed_objects->grafts_nr,
commit_graft_sha1_access);
}
--
2.17.0.582.gccdcbd54c44.dirty
Stefan Beller <sbeller@google.com>