From: Jonathan Nieder <jrnieder@xxxxxxxxx>
Add a repository argument to allow the caller of read_graft_file 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@xxxxxxxxx>
Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx>
---
commit.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/commit.c b/commit.c
index ce18e41e33..d2c6367f85 100644
--- a/commit.c
+++ b/commit.c
@@ -178,7 +178,8 @@ struct commit_graft *read_graft_line(struct strbuf *line)
return NULL;
}
-static int read_graft_file(const char *graft_file)
+#define read_graft_file(r, f) read_graft_file_##r(f)
+static int read_graft_file_the_repository(const char *graft_file)
{
FILE *fp = fopen_or_warn(graft_file, "r");
struct strbuf buf = STRBUF_INIT;
@@ -205,7 +206,7 @@ static void prepare_commit_graft(void)
if (commit_graft_prepared)
return;
graft_file = get_graft_file();
- read_graft_file(graft_file);
+ read_graft_file(the_repository, graft_file);
/* make sure shallows are read */
is_repository_shallow();
commit_graft_prepared = 1;
--
2.15.1.433.g936d1b9894.dirty
