config: don't implicitly use gitdir or commondir

'git_config_with_options()' takes a 'config_options' struct which
contains feilds for 'git_dir' and 'commondir'.  If those feilds happen
to be NULL the config machinery falls back to querying global repository
state.  Let's change this and instead use these fields in the
'config_options' struct explicilty all the time.  Since the API is
slightly changing to require these two fields to be set if callers want
the config machinery to load the repository's config, let's change the
name to 'config_with_optison()'.  This allows the config machinery to
not implicitly rely on any global repository state.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/config.c b/builtin/config.c
index b2045cd6c38185264fa32b86b145d30d015a1e43..1fc6471f37a061318ea16442a15c378c49648188 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -243,8 +243,8 @@ static int get_value(const char *key_, const char *regex_)
                }
        }
 
                }
        }
 

-       git_config_with_options(collect_config, &values,
-                               &given_config_source, &config_options);
+       config_with_options(collect_config, &values,
+                           &given_config_source, &config_options);

 
        ret = !values.nr;
 
 
        ret = !values.nr;
 


@@ -321,8 +321,8 @@ static void get_color(const char *var, const char *def_color)
        get_color_slot = var;
        get_color_found = 0;
        parsed_color[0] = '\0';
        get_color_slot = var;
        get_color_found = 0;
        parsed_color[0] = '\0';

-       git_config_with_options(git_get_color_config, NULL,
-                               &given_config_source, &config_options);
+       config_with_options(git_get_color_config, NULL,
+                           &given_config_source, &config_options);

 
        if (!get_color_found && def_color) {
                if (color_parse(def_color, parsed_color) < 0)
 
        if (!get_color_found && def_color) {
                if (color_parse(def_color, parsed_color) < 0)


@@ -353,8 +353,8 @@ static int get_colorbool(const char *var, int print)
        get_colorbool_found = -1;
        get_diff_color_found = -1;
        get_color_ui_found = -1;
        get_colorbool_found = -1;
        get_diff_color_found = -1;
        get_color_ui_found = -1;

-       git_config_with_options(git_get_colorbool_config, NULL,
-                               &given_config_source, &config_options);
+       config_with_options(git_get_colorbool_config, NULL,
+                           &given_config_source, &config_options);

 
        if (get_colorbool_found < 0) {
                if (!strcmp(get_colorbool_slot, "color.diff"))
 
        if (get_colorbool_found < 0) {
                if (!strcmp(get_colorbool_slot, "color.diff"))


@@ -442,8 +442,8 @@ static int get_urlmatch(const char *var, const char *url)
                show_keys = 1;
        }
 
                show_keys = 1;
        }
 

-       git_config_with_options(urlmatch_config_entry, &config,
-                               &given_config_source, &config_options);
+       config_with_options(urlmatch_config_entry, &config,
+                           &given_config_source, &config_options);

 
        ret = !values.nr;
 
 
        ret = !values.nr;
 


@@ -536,6 +536,10 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                config_options.respect_includes = !given_config_source.file;
        else
                config_options.respect_includes = respect_includes_opt;
                config_options.respect_includes = !given_config_source.file;
        else
                config_options.respect_includes = respect_includes_opt;

+       if (!nongit) {
+               config_options.commondir = get_git_common_dir();
+               config_options.git_dir = get_git_dir();
+       }

 
        if (end_null) {
                term = '\0';
 
        if (end_null) {
                term = '\0';


@@ -580,9 +584,9 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 
        if (actions == ACTION_LIST) {
                check_argc(argc, 0, 0);
 
        if (actions == ACTION_LIST) {
                check_argc(argc, 0, 0);

-               if (git_config_with_options(show_all_config, NULL,
-                                           &given_config_source,
-                                           &config_options) < 0) {
+               if (config_with_options(show_all_config, NULL,
+                                       &given_config_source,
+                                       &config_options) < 0) {

                        if (given_config_source.file)
                                die_errno("unable to read config file '%s'",
                                          given_config_source.file);
                        if (given_config_source.file)
                                die_errno("unable to read config file '%s'",
                                          given_config_source.file);

diff --git a/config.c b/config.c
index edc0d1770860dcfc814e698aa34d6d70d5f3a5b0..ca9e9efec134a2a9380528e92567cfb3b9b6847e 100644 (file)
--- a/config.c
+++ b/config.c
@@ -218,8 +218,6 @@ static int include_by_gitdir(const struct config_options *opts,
 
        if (opts->git_dir)
                git_dir = opts->git_dir;
 
        if (opts->git_dir)
                git_dir = opts->git_dir;

-       else if (have_git_dir())
-               git_dir = get_git_dir();

        else
                goto done;
 
        else
                goto done;
 


@@ -1533,8 +1531,6 @@ static int do_git_config_sequence(const struct config_options *opts,
 
        if (opts->commondir)
                repo_config = mkpathdup("%s/config", opts->commondir);
 
        if (opts->commondir)
                repo_config = mkpathdup("%s/config", opts->commondir);

-       else if (have_git_dir())
-               repo_config = git_pathdup("config");

        else
                repo_config = NULL;
 
        else
                repo_config = NULL;
 


@@ -1565,9 +1561,9 @@ static int do_git_config_sequence(const struct config_options *opts,
        return ret;
 }
 
        return ret;
 }
 

-int git_config_with_options(config_fn_t fn, void *data,
-                           struct git_config_source *config_source,
-                           const struct config_options *opts)
+int config_with_options(config_fn_t fn, void *data,
+                       struct git_config_source *config_source,
+                       const struct config_options *opts)

 {
        struct config_include_data inc = CONFIG_INCLUDE_INIT;
 
 {
        struct config_include_data inc = CONFIG_INCLUDE_INIT;
 


@@ -1598,9 +1594,14 @@ static void git_config_raw(config_fn_t fn, void *data)
        struct config_options opts = {0};
 
        opts.respect_includes = 1;
        struct config_options opts = {0};
 
        opts.respect_includes = 1;

-       if (git_config_with_options(fn, data, NULL, &opts) < 0)
+       if (have_git_dir()) {
+               opts.commondir = get_git_common_dir();
+               opts.git_dir = get_git_dir();
+       }
+
+       if (config_with_options(fn, data, NULL, &opts) < 0)

                /*
                /*

-                * git_config_with_options() normally returns only
+                * config_with_options() normally returns only

                 * zero, as most errors are fatal, and
                 * non-fatal potential errors are guarded by "if"
                 * statements that are entered only when no error is
                 * zero, as most errors are fatal, and
                 * non-fatal potential errors are guarded by "if"
                 * statements that are entered only when no error is


@@ -1660,7 +1661,7 @@ void read_early_config(config_fn_t cb, void *data)
                opts.git_dir = gitdir.buf;
        }
 
                opts.git_dir = gitdir.buf;
        }
 

-       git_config_with_options(cb, data, NULL, &opts);
+       config_with_options(cb, data, NULL, &opts);

 
        strbuf_release(&commondir);
        strbuf_release(&gitdir);
 
        strbuf_release(&commondir);
        strbuf_release(&gitdir);

diff --git a/config.h b/config.h
index 63b92784cd6cbe0f32a521e6edafc577ac7b24eb..9e038cce256fb12e8af0b85d0cbdb5068f6e9e68 100644 (file)
--- a/config.h
+++ b/config.h
@@ -45,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_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 *);
 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 *);