builtin/config: pull out function to handle config location

There's quite a bunch of options to git-config(1) that allow the user to
specify which config location to use when reading or writing config
options. The logic to handle this is thus by necessity also quite
involved.

Pull it out into a separate function so that we can reuse it in
subsequent commits which introduce proper subcommands.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/config.c b/builtin/config.c
index 8991533e08b43de25853980565aba52abaf799dd..8c7cd30cb4675bbdbcd27b48301006352aa71a33 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -623,68 +623,8 @@ static char *default_user_config(void)
        return strbuf_detach(&buf, NULL);
 }
 
-static struct option builtin_config_options[] = {
-       OPT_GROUP(N_("Config file location")),
-       OPT_BOOL(0, "global", &use_global_config, N_("use global config file")),
-       OPT_BOOL(0, "system", &use_system_config, N_("use system config file")),
-       OPT_BOOL(0, "local", &use_local_config, N_("use repository config file")),
-       OPT_BOOL(0, "worktree", &use_worktree_config, N_("use per-worktree config file")),
-       OPT_STRING('f', "file", &given_config_source.file, N_("file"), N_("use given config file")),
-       OPT_STRING(0, "blob", &given_config_source.blob, N_("blob-id"), N_("read config from given blob object")),
-       OPT_GROUP(N_("Action")),
-       OPT_CMDMODE(0, "get", &actions, N_("get value: name [<value-pattern>]"), ACTION_GET),
-       OPT_CMDMODE(0, "get-all", &actions, N_("get all values: key [<value-pattern>]"), ACTION_GET_ALL),
-       OPT_CMDMODE(0, "get-regexp", &actions, N_("get values for regexp: name-regex [<value-pattern>]"), ACTION_GET_REGEXP),
-       OPT_CMDMODE(0, "get-urlmatch", &actions, N_("get value specific for the URL: section[.var] URL"), ACTION_GET_URLMATCH),
-       OPT_CMDMODE(0, "replace-all", &actions, N_("replace all matching variables: name value [<value-pattern>]"), ACTION_REPLACE_ALL),
-       OPT_CMDMODE(0, "add", &actions, N_("add a new variable: name value"), ACTION_ADD),
-       OPT_CMDMODE(0, "unset", &actions, N_("remove a variable: name [<value-pattern>]"), ACTION_UNSET),
-       OPT_CMDMODE(0, "unset-all", &actions, N_("remove all matches: name [<value-pattern>]"), ACTION_UNSET_ALL),
-       OPT_CMDMODE(0, "rename-section", &actions, N_("rename section: old-name new-name"), ACTION_RENAME_SECTION),
-       OPT_CMDMODE(0, "remove-section", &actions, N_("remove a section: name"), ACTION_REMOVE_SECTION),
-       OPT_CMDMODE('l', "list", &actions, N_("list all"), ACTION_LIST),
-       OPT_CMDMODE('e', "edit", &actions, N_("open an editor"), ACTION_EDIT),
-       OPT_CMDMODE(0, "get-color", &actions, N_("find the color configured: slot [<default>]"), ACTION_GET_COLOR),
-       OPT_CMDMODE(0, "get-colorbool", &actions, N_("find the color setting: slot [<stdout-is-tty>]"), ACTION_GET_COLORBOOL),
-       OPT_GROUP(N_("Type")),
-       OPT_CALLBACK('t', "type", &type, N_("type"), N_("value is given this type"), option_parse_type),
-       OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or \"false\""), TYPE_BOOL),
-       OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"), TYPE_INT),
-       OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or --int"), TYPE_BOOL_OR_INT),
-       OPT_CALLBACK_VALUE(0, "bool-or-str", &type, N_("value is --bool or string"), TYPE_BOOL_OR_STR),
-       OPT_CALLBACK_VALUE(0, "path", &type, N_("value is a path (file or directory name)"), TYPE_PATH),
-       OPT_CALLBACK_VALUE(0, "expiry-date", &type, N_("value is an expiry date"), TYPE_EXPIRY_DATE),
-       OPT_GROUP(N_("Other")),
-       OPT_BOOL('z', "null", &end_nul, N_("terminate values with NUL byte")),
-       OPT_BOOL(0, "name-only", &omit_values, N_("show variable names only")),
-       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_BOOL(0, "show-scope", &show_scope, N_("show scope of config (worktree, local, global, system, command)")),
-       OPT_STRING(0, "default", &default_value, N_("value"), N_("with --get, use default value when missing entry")),
-       OPT_STRING(0, "comment", &comment_arg, N_("value"), N_("human-readable comment string (# will be prepended as needed)")),
-       OPT_BOOL(0, "fixed-value", &fixed_value, N_("use string equality when comparing values to 'value-pattern'")),
-       OPT_END(),
-};
-
-static NORETURN void usage_builtin_config(void)
+static void handle_config_location(const char *prefix)
 {
-       usage_with_options(builtin_config_usage, builtin_config_options);
-}
-
-int cmd_config(int argc, const char **argv, const char *prefix)
-{
-       int nongit = !startup_info->have_repository;
-       char *value = NULL, *comment = NULL;
-       int flags = 0;
-       int ret = 0;
-       struct key_value_info default_kvi = KVI_INIT;
-
-       given_config_source.file = xstrdup_or_null(getenv(CONFIG_ENVIRONMENT));
-
-       argc = parse_options(argc, argv, prefix, builtin_config_options,
-                            builtin_config_usage,
-                            PARSE_OPT_STOP_AT_NON_OPTION);
-
        if (use_global_config + use_system_config + use_local_config +
            use_worktree_config +
            !!given_config_source.file + !!given_config_source.blob > 1) {
@@ -692,14 +632,13 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                usage_builtin_config();
        }
 
-       if (nongit) {
+       if (!startup_info->have_repository) {
                if (use_local_config)
                        die(_("--local can only be used inside a git repository"));
                if (given_config_source.blob)
                        die(_("--blob can only be used inside a git repository"));
                if (use_worktree_config)
                        die(_("--worktree can only be used inside a git repository"));
-
        }
 
        if (given_config_source.file &&
@@ -753,10 +692,74 @@ 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;
-       if (!nongit) {
+       if (startup_info->have_repository) {
                config_options.commondir = get_git_common_dir();
                config_options.git_dir = get_git_dir();
        }
+}
+
+static struct option builtin_config_options[] = {
+       OPT_GROUP(N_("Config file location")),
+       OPT_BOOL(0, "global", &use_global_config, N_("use global config file")),
+       OPT_BOOL(0, "system", &use_system_config, N_("use system config file")),
+       OPT_BOOL(0, "local", &use_local_config, N_("use repository config file")),
+       OPT_BOOL(0, "worktree", &use_worktree_config, N_("use per-worktree config file")),
+       OPT_STRING('f', "file", &given_config_source.file, N_("file"), N_("use given config file")),
+       OPT_STRING(0, "blob", &given_config_source.blob, N_("blob-id"), N_("read config from given blob object")),
+       OPT_GROUP(N_("Action")),
+       OPT_CMDMODE(0, "get", &actions, N_("get value: name [<value-pattern>]"), ACTION_GET),
+       OPT_CMDMODE(0, "get-all", &actions, N_("get all values: key [<value-pattern>]"), ACTION_GET_ALL),
+       OPT_CMDMODE(0, "get-regexp", &actions, N_("get values for regexp: name-regex [<value-pattern>]"), ACTION_GET_REGEXP),
+       OPT_CMDMODE(0, "get-urlmatch", &actions, N_("get value specific for the URL: section[.var] URL"), ACTION_GET_URLMATCH),
+       OPT_CMDMODE(0, "replace-all", &actions, N_("replace all matching variables: name value [<value-pattern>]"), ACTION_REPLACE_ALL),
+       OPT_CMDMODE(0, "add", &actions, N_("add a new variable: name value"), ACTION_ADD),
+       OPT_CMDMODE(0, "unset", &actions, N_("remove a variable: name [<value-pattern>]"), ACTION_UNSET),
+       OPT_CMDMODE(0, "unset-all", &actions, N_("remove all matches: name [<value-pattern>]"), ACTION_UNSET_ALL),
+       OPT_CMDMODE(0, "rename-section", &actions, N_("rename section: old-name new-name"), ACTION_RENAME_SECTION),
+       OPT_CMDMODE(0, "remove-section", &actions, N_("remove a section: name"), ACTION_REMOVE_SECTION),
+       OPT_CMDMODE('l', "list", &actions, N_("list all"), ACTION_LIST),
+       OPT_CMDMODE('e', "edit", &actions, N_("open an editor"), ACTION_EDIT),
+       OPT_CMDMODE(0, "get-color", &actions, N_("find the color configured: slot [<default>]"), ACTION_GET_COLOR),
+       OPT_CMDMODE(0, "get-colorbool", &actions, N_("find the color setting: slot [<stdout-is-tty>]"), ACTION_GET_COLORBOOL),
+       OPT_GROUP(N_("Type")),
+       OPT_CALLBACK('t', "type", &type, N_("type"), N_("value is given this type"), option_parse_type),
+       OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or \"false\""), TYPE_BOOL),
+       OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"), TYPE_INT),
+       OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or --int"), TYPE_BOOL_OR_INT),
+       OPT_CALLBACK_VALUE(0, "bool-or-str", &type, N_("value is --bool or string"), TYPE_BOOL_OR_STR),
+       OPT_CALLBACK_VALUE(0, "path", &type, N_("value is a path (file or directory name)"), TYPE_PATH),
+       OPT_CALLBACK_VALUE(0, "expiry-date", &type, N_("value is an expiry date"), TYPE_EXPIRY_DATE),
+       OPT_GROUP(N_("Other")),
+       OPT_BOOL('z', "null", &end_nul, N_("terminate values with NUL byte")),
+       OPT_BOOL(0, "name-only", &omit_values, N_("show variable names only")),
+       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_BOOL(0, "show-scope", &show_scope, N_("show scope of config (worktree, local, global, system, command)")),
+       OPT_STRING(0, "default", &default_value, N_("value"), N_("with --get, use default value when missing entry")),
+       OPT_STRING(0, "comment", &comment_arg, N_("value"), N_("human-readable comment string (# will be prepended as needed)")),
+       OPT_BOOL(0, "fixed-value", &fixed_value, N_("use string equality when comparing values to 'value-pattern'")),
+       OPT_END(),
+};
+
+static NORETURN void usage_builtin_config(void)
+{
+       usage_with_options(builtin_config_usage, builtin_config_options);
+}
+
+int cmd_config(int argc, const char **argv, const char *prefix)
+{
+       char *value = NULL, *comment = NULL;
+       int flags = 0;
+       int ret = 0;
+       struct key_value_info default_kvi = KVI_INIT;
+
+       given_config_source.file = xstrdup_or_null(getenv(CONFIG_ENVIRONMENT));
+
+       argc = parse_options(argc, argv, prefix, builtin_config_options,
+                            builtin_config_usage,
+                            PARSE_OPT_STOP_AT_NON_OPTION);
+
+       handle_config_location(prefix);
 
        if (end_nul) {
                term = '\0';
@@ -858,7 +861,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                char *config_file;
 
                check_argc(argc, 0, 0);
-               if (!given_config_source.file && nongit)
+               if (!given_config_source.file && !startup_info->have_repository)
                        die(_("not in a git directory"));
                if (given_config_source.use_stdin)
                        die(_("editing stdin is not supported"));