summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2018-05-15 16:42:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-16 11:42:03 +0900
commit3ee37656ee6e6c2510add974af057a9d02d3cf4a (patch)
tree3534052962268aacc7ca628ccd69339f066d7932
parentcommit: add repository argument to read_graft_file (diff)
downloadtgif-3ee37656ee6e6c2510add974af057a9d02d3cf4a.tar.xz
commit: add repository argument to prepare_commit_graft
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--commit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/commit.c b/commit.c
index b5c0aec24a..a0400b93a1 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;