From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Mar 2018 18:34:41 +0000 (-0700)
Subject: Merge branch 'nd/remove-ignore-env-field' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ba9d0f25656febec5d2d2a328b69a9668f50fddf?hp=2bee77135e538f2fb682de42a569a93dbfdedc16

Merge branch 'nd/remove-ignore-env-field' into next

Code clean-up for the "repository" abstraction.

* nd/remove-ignore-env-field:
repository.h: add comment and clarify repo_set_gitdir
---

diff --git a/repository.h b/repository.h
index e7127baffb..f21fd93f72 100644
--- a/repository.h
+++ b/repository.h
@@ -82,6 +82,10 @@ struct repository {
 
 extern struct repository *the_repository;
 
+/*
+ * Define a custom repository layout. Any field can be NULL, which
+ * will default back to the path according to the default layout.
+ */
 struct set_gitdir_args {
 	const char *commondir;
 	const char *object_dir;
@@ -92,7 +96,7 @@ struct set_gitdir_args {
 
 extern void repo_set_gitdir(struct repository *repo,
 			    const char *root,
-			    const struct set_gitdir_args *optional);
+			    const struct set_gitdir_args *extra_args);
 extern void repo_set_worktree(struct repository *repo, const char *path);
 extern void repo_set_hash_algo(struct repository *repo, int algo);
 extern void initialize_the_repository(void);