diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:28:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:28:09 -0700 |
| commit | 613e4e5f4046ee36f40199cbaeb9f35442d24378 (patch) | |
| tree | 186534e4bf0780726df7074c5e946a83bb12187a /builtin | |
| parent | Merge branch 'nd/fix-sparse-checkout' (diff) | |
| parent | config: add --local option (diff) | |
| download | tgif-613e4e5f4046ee36f40199cbaeb9f35442d24378.tar.xz | |
Merge branch 'sr/local-config'
* sr/local-config:
config: add --local option
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/config.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c index f3d1660d02..79fee767b8 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -20,7 +20,7 @@ static char delim = '='; static char key_delim = ' '; static char term = '\n'; -static int use_global_config, use_system_config; +static int use_global_config, use_system_config, use_local_config; static const char *given_config_file; static int actions, types; static const char *get_color_slot, *get_colorbool_slot; @@ -51,6 +51,7 @@ static struct option builtin_config_options[] = { OPT_GROUP("Config file location"), OPT_BOOLEAN(0, "global", &use_global_config, "use global config file"), OPT_BOOLEAN(0, "system", &use_system_config, "use system config file"), + OPT_BOOLEAN(0, "local", &use_local_config, "use repository config file"), OPT_STRING('f', "file", &given_config_file, "FILE", "use given config file"), OPT_GROUP("Action"), OPT_BIT(0, "get", &actions, "get value: name [value-regex]", ACTION_GET), @@ -342,7 +343,7 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix) builtin_config_usage, PARSE_OPT_STOP_AT_NON_OPTION); - if (use_global_config + use_system_config + !!given_config_file > 1) { + if (use_global_config + use_system_config + use_local_config + !!given_config_file > 1) { error("only one config file at a time."); usage_with_options(builtin_config_usage, builtin_config_options); } @@ -358,6 +359,8 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix) } else if (use_system_config) config_exclusive_filename = git_etc_gitconfig(); + else if (use_local_config) + config_exclusive_filename = git_pathdup("config"); else if (given_config_file) { if (!is_absolute_path(given_config_file) && prefix) config_exclusive_filename = prefix_filename(prefix, |