Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> --- cache.h | 2 +- commit.c | 2 +- environment.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cache.h b/cache.h index ee01daf130..a74a10fe1f 100644 --- a/cache.h +++ b/cache.h @@ -489,7 +489,7 @@ extern const char *get_git_dir(void); extern const char *get_git_common_dir(void); extern char *get_object_directory(void); extern char *get_index_file(void); -extern char *get_graft_file(void); +extern char *get_graft_file(struct repository *r); extern int set_git_dir(const char *path); extern int get_common_dir_noenv(struct strbuf *sb, const char *gitdir); extern int get_common_dir(struct strbuf *sb, const char *gitdir); diff --git a/commit.c b/commit.c index a5e570f057..32eda5f7c9 100644 --- a/commit.c +++ b/commit.c @@ -205,7 +205,7 @@ static void prepare_commit_graft_the_repository(void) if (commit_graft_prepared) return; - graft_file = get_graft_file(); + graft_file = get_graft_file(the_repository); read_graft_file(the_repository, graft_file); /* make sure shallows are read */ is_repository_shallow(); diff --git a/environment.c b/environment.c index 249516cf6b..972ade61d8 100644 --- a/environment.c +++ b/environment.c @@ -287,11 +287,11 @@ char *get_index_file(void) return the_repository->index_file; } -char *get_graft_file(void) +char *get_graft_file(struct repository *r) { - if (!the_repository->graft_file) + if (!r->graft_file) BUG("git environment hasn't been setup"); - return the_repository->graft_file; + return r->graft_file; } int set_git_dir(const char *path) -- 2.15.1.433.g936d1b9894.dirty