cache: convert get_graft_file to handle arbitrary repositories

stefanbeller · gitster · commit 0437a2e365f3 · 2018-05-18T08:13:10.000+09:00
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 &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -316,11 +316,11 @@ char *get_index_file(void)`
`316`	`316`	`return the_repository->index_file;`
`317`	`317`	`}`
`318`	`318`
`319`		`-char *get_graft_file(void)`
	`319`	`+char get_graft_file(struct repository r)`
`320`	`320`	`{`
`321`		`- if (!the_repository->graft_file)`
	`321`	`+ if (!r->graft_file)`
`322`	`322`	`BUG("git environment hasn't been setup");`
`323`		`- return the_repository->graft_file;`
	`323`	`+ return r->graft_file;`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`int set_git_dir(const char *path)`