config: prepare to pass more info in git_config_with_options()

So far we can only pass one flag, respect_includes, to thie function. We
need to pass some more (non-flag even), so let's make it accept a struct
instead of an integer.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/config.c b/builtin/config.c
index 4f49a0edb9071f4f63e97dfae902ff7a0aa51ee9..b937d175a9e2fea01983bf39b8fe846c6ea0acf7 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -26,7 +26,8 @@ static int use_global_config, use_system_config, use_local_config;
 static struct git_config_source given_config_source;
 static int actions, types;
 static int end_null;
 static struct git_config_source given_config_source;
 static int actions, types;
 static int end_null;

-static int respect_includes = -1;
+static int respect_includes_opt = -1;
+static struct config_options config_options;

 static int show_origin;
 
 #define ACTION_GET (1<<0)
 static int show_origin;
 
 #define ACTION_GET (1<<0)


@@ -81,7 +82,7 @@ static struct option builtin_config_options[] = {
        OPT_GROUP(N_("Other")),
        OPT_BOOL('z', "null", &end_null, N_("terminate values with NUL byte")),
        OPT_BOOL(0, "name-only", &omit_values, N_("show variable names only")),
        OPT_GROUP(N_("Other")),
        OPT_BOOL('z', "null", &end_null, N_("terminate values with NUL byte")),
        OPT_BOOL(0, "name-only", &omit_values, N_("show variable names only")),

-       OPT_BOOL(0, "includes", &respect_includes, N_("respect include directives on lookup")),
+       OPT_BOOL(0, "includes", &respect_includes_opt, N_("respect include directives on lookup")),

        OPT_BOOL(0, "show-origin", &show_origin, N_("show origin of config (file, standard input, blob, command line)")),
        OPT_END(),
 };
        OPT_BOOL(0, "show-origin", &show_origin, N_("show origin of config (file, standard input, blob, command line)")),
        OPT_END(),
 };


@@ -242,7 +243,7 @@ static int get_value(const char *key_, const char *regex_)
        }
 
        git_config_with_options(collect_config, &values,
        }
 
        git_config_with_options(collect_config, &values,

-                               &given_config_source, respect_includes);
+                               &given_config_source, &config_options);

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


@@ -320,7 +321,7 @@ static void get_color(const char *var, const char *def_color)
        get_color_found = 0;
        parsed_color[0] = '\0';
        git_config_with_options(git_get_color_config, NULL,
        get_color_found = 0;
        parsed_color[0] = '\0';
        git_config_with_options(git_get_color_config, NULL,

-                               &given_config_source, respect_includes);
+                               &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)


@@ -352,7 +353,7 @@ static int get_colorbool(const char *var, int print)
        get_diff_color_found = -1;
        get_color_ui_found = -1;
        git_config_with_options(git_get_colorbool_config, NULL,
        get_diff_color_found = -1;
        get_color_ui_found = -1;
        git_config_with_options(git_get_colorbool_config, NULL,

-                               &given_config_source, respect_includes);
+                               &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"))


@@ -441,7 +442,7 @@ static int get_urlmatch(const char *var, const char *url)
        }
 
        git_config_with_options(urlmatch_config_entry, &config,
        }
 
        git_config_with_options(urlmatch_config_entry, &config,

-                               &given_config_source, respect_includes);
+                               &given_config_source, &config_options);

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


@@ -530,8 +531,10 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                                prefix_filename(prefix, given_config_source.file);
        }
 
                                prefix_filename(prefix, given_config_source.file);
        }
 

-       if (respect_includes == -1)
-               respect_includes = !given_config_source.file;
+       if (respect_includes_opt == -1)
+               config_options.respect_includes = !given_config_source.file;
+       else
+               config_options.respect_includes = respect_includes_opt;

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


@@ -578,7 +581,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                check_argc(argc, 0, 0);
                if (git_config_with_options(show_all_config, NULL,
                                            &given_config_source,
                check_argc(argc, 0, 0);
                if (git_config_with_options(show_all_config, NULL,
                                            &given_config_source,

-                                           respect_includes) < 0) {
+                                           &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/cache.h b/cache.h
index 556468c25b8c3a06eb776fbf322bed805ec97c33..a6294d257375ac8ee1fe04d6ca7c1c37f4cdc511 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1885,6 +1885,10 @@ enum config_origin_type {
        CONFIG_ORIGIN_CMDLINE
 };
 
        CONFIG_ORIGIN_CMDLINE
 };
 

+struct config_options {
+       unsigned int respect_includes : 1;
+};
+

 typedef int (*config_fn_t)(const char *, const char *, void *);
 extern int git_default_config(const char *, const char *, void *);
 extern int git_config_from_file(config_fn_t fn, const char *, void *);
 typedef int (*config_fn_t)(const char *, const char *, void *);
 extern int git_default_config(const char *, const char *, void *);
 extern int git_config_from_file(config_fn_t fn, const char *, void *);


@@ -1898,7 +1902,7 @@ 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,
 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,

-                                  int respect_includes);
+                                  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 *);


@@ -1950,6 +1954,7 @@ struct config_include_data {
        int depth;
        config_fn_t fn;
        void *data;
        int depth;
        config_fn_t fn;
        void *data;

+       const struct config_options *opts;

 };
 #define CONFIG_INCLUDE_INIT { 0 }
 extern int git_config_include(const char *name, const char *value, void *data);
 };
 #define CONFIG_INCLUDE_INIT { 0 }
 extern int git_config_include(const char *name, const char *value, void *data);

diff --git a/config.c b/config.c
index 1a4d85537b3c96749999250a34216257db134714..042321a3a0a3d6441ce2f34b89da47ea96a2a974 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1530,13 +1530,14 @@ static int do_git_config_sequence(config_fn_t fn, void *data)
 
 int git_config_with_options(config_fn_t fn, void *data,
                            struct git_config_source *config_source,
 
 int git_config_with_options(config_fn_t fn, void *data,
                            struct git_config_source *config_source,

-                           int respect_includes)
+                           const struct config_options *opts)

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

-       if (respect_includes) {
+       if (opts->respect_includes) {

                inc.fn = fn;
                inc.data = data;
                inc.fn = fn;
                inc.data = data;

+               inc.opts = opts;

                fn = git_config_include;
                data = &inc;
        }
                fn = git_config_include;
                data = &inc;
        }


@@ -1557,7 +1558,10 @@ int git_config_with_options(config_fn_t fn, void *data,
 
 static void git_config_raw(config_fn_t fn, void *data)
 {
 
 static void git_config_raw(config_fn_t fn, void *data)
 {

-       if (git_config_with_options(fn, data, NULL, 1) < 0)
+       struct config_options opts = {0};
+
+       opts.respect_includes = 1;
+       if (git_config_with_options(fn, data, NULL, &opts) < 0)

                /*
                 * git_config_with_options() normally returns only
                 * zero, as most errors are fatal, and
                /*
                 * git_config_with_options() normally returns only
                 * zero, as most errors are fatal, and


@@ -1597,9 +1601,11 @@ static void configset_iter(struct config_set *cs, config_fn_t fn, void *data)
 
 void read_early_config(config_fn_t cb, void *data)
 {
 
 void read_early_config(config_fn_t cb, void *data)
 {

+       struct config_options opts = {0};

        struct strbuf buf = STRBUF_INIT;
 
        struct strbuf buf = STRBUF_INIT;
 

-       git_config_with_options(cb, data, NULL, 1);
+       opts.respect_includes = 1;
+       git_config_with_options(cb, data, NULL, &opts);

 
        /*
         * When setup_git_directory() was not yet asked to discover the
 
        /*
         * When setup_git_directory() was not yet asked to discover the


@@ -1615,7 +1621,7 @@ void read_early_config(config_fn_t cb, void *data)
                memset(&repo_config, 0, sizeof(repo_config));
                strbuf_addstr(&buf, "/config");
                repo_config.file = buf.buf;
                memset(&repo_config, 0, sizeof(repo_config));
                strbuf_addstr(&buf, "/config");
                repo_config.file = buf.buf;

-               git_config_with_options(cb, data, &repo_config, 1);
+               git_config_with_options(cb, data, &repo_config, &opts);

        }
        strbuf_release(&buf);
 }
        }
        strbuf_release(&buf);
 }