config: don't implicitly use gitdir or commondir

diff --git a/config.h b/config.h
index c70599bd5f00e876cfc7bed136a43a0c7ccbaaf4..9e038cce256fb12e8af0b85d0cbdb5068f6e9e68 100644 (file)
--- a/config.h
+++ b/config.h
@@ -30,6 +30,7 @@ enum config_origin_type {
 
 struct config_options {
        unsigned int respect_includes : 1;
+       const char *commondir;
        const char *git_dir;
 };
 
@@ -44,9 +45,9 @@ extern void git_config_push_parameter(const char *text);
 extern int git_config_from_parameters(config_fn_t fn, void *data);
 extern void read_early_config(config_fn_t cb, void *data);
 extern void git_config(config_fn_t fn, void *);
-extern int git_config_with_options(config_fn_t fn, void *,
-                                  struct git_config_source *config_source,
-                                  const struct config_options *opts);
+extern int config_with_options(config_fn_t fn, void *,
+                              struct git_config_source *config_source,
+                              const struct config_options *opts);
 extern int git_parse_ulong(const char *, unsigned long *);
 extern int git_parse_maybe_bool(const char *);
 extern int git_config_int(const char *, const char *);