[PATCH 15/19] cache: convert get_graft_file to handle arbitrary repositories
- From
Stefan Beller <sbeller@google.com>
- Date
- May 17, 2018, 22:51 UTC
- Message-ID
- <20180517225154.9200-16-sbeller@google.com>
- In-Reply-To
- <20180517225154.9200-1-sbeller@google.com>
This conversion was done without the #define trick used in the earlier series refactoring to have better repository access, because this function is easy to review, as all lines are converted and it has only one caller.
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- 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 ab716011b7e..cb1aeb1dcbf 100644 --- a/cache.h +++ b/cache.h @@ -476,7 +476,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 3fcb2fd66ce..24028fd257a 100644 --- a/commit.c +++ b/commit.c @@ -204,7 +204,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(the_repository); diff --git a/environment.c b/environment.c index 87d9e52ffde..ab42346e563 100644 --- a/environment.c +++ b/environment.c @@ -316,11 +316,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.17.0.582.gccdcbd54c44.dirty