[PATCH 141/194] commit: convert register_commit_graft to handle arbitrary repositories

[Stefan Beller <sbeller@xxxxxxxxxx>]

From: Brandon Williams <bmwill@xxxxxxxxxx>

Signed-off-by: Brandon Williams <bmwill@xxxxxxxxxx>
Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx>
---
 commit.c | 29 +++++++++++++++--------------
 commit.h |  3 +--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/commit.c b/commit.c
index 0d006ab1bb..43ed3298cc 100644
--- a/commit.c
+++ b/commit.c
@@ -112,30 +112,31 @@ static int commit_graft_pos(struct repository *r, const unsigned char *sha1)
 			commit_graft_sha1_access);
 }
 
-int register_commit_graft_the_repository(struct commit_graft *graft, int ignore_dups)
+int register_commit_graft(struct repository *r, struct commit_graft *graft,
+			  int ignore_dups)
 {
-	int pos = commit_graft_pos(the_repository, graft->oid.hash);
+	int pos = commit_graft_pos(r, graft->oid.hash);
 
 	if (0 <= pos) {
 		if (ignore_dups)
 			free(graft);
 		else {
-			free(the_repository->parsed_objects.grafts[pos]);
-			the_repository->parsed_objects.grafts[pos] = graft;
+			free(r->parsed_objects.grafts[pos]);
+			r->parsed_objects.grafts[pos] = graft;
 		}
 		return 1;
 	}
 	pos = -pos - 1;
-	ALLOC_GROW(the_repository->parsed_objects.grafts,
-		   the_repository->parsed_objects.grafts_nr + 1,
-		   the_repository->parsed_objects.grafts_alloc);
-	the_repository->parsed_objects.grafts_nr++;
-	if (pos < the_repository->parsed_objects.grafts_nr)
-		memmove(the_repository->parsed_objects.grafts + pos + 1,
-			the_repository->parsed_objects.grafts + pos,
-			(the_repository->parsed_objects.grafts_nr - pos - 1) *
-			sizeof(*the_repository->parsed_objects.grafts));
-	the_repository->parsed_objects.grafts[pos] = graft;
+	ALLOC_GROW(r->parsed_objects.grafts,
+		   r->parsed_objects.grafts_nr + 1,
+		   r->parsed_objects.grafts_alloc);
+	r->parsed_objects.grafts_nr++;
+	if (pos < r->parsed_objects.grafts_nr)
+		memmove(r->parsed_objects.grafts + pos + 1,
+			r->parsed_objects.grafts + pos,
+			(r->parsed_objects.grafts_nr - pos - 1) *
+			sizeof(*r->parsed_objects.grafts));
+	r->parsed_objects.grafts[pos] = graft;
 	return 0;
 }
 
diff --git a/commit.h b/commit.h
index 41a8947b33..870ad525fd 100644
--- a/commit.h
+++ b/commit.h
@@ -175,8 +175,7 @@ struct commit_graft {
 typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
 
 struct commit_graft *read_graft_line(struct strbuf *line);
-#define register_commit_graft(r, g, i) register_commit_graft_##r(g, i)
-int register_commit_graft_the_repository(struct commit_graft *, int);
+int register_commit_graft(struct repository *r, struct commit_graft *, int);
 #define lookup_commit_graft(r, o) lookup_commit_graft_##r(o)
 struct commit_graft *lookup_commit_graft_the_repository(const struct object_id *oid);
 
-- 
2.15.1.433.g936d1b9894.dirty