undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sr/local-config'

Browse Source 
* sr/local-config:
  config: add --local option
This commit is contained in:
Junio C Hamano 2010-08-21 23:28:09 -07:00
commit 613e4e5f40
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/config.c
View File

@ -20,7 +20,7 @@ static char delim = '=';
static char key_delim = ' '; static char key_delim = ' ';
static char term = '\n'; 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 const char *given_config_file;
static int actions, types; static int actions, types;
static const char *get_color_slot, *get_colorbool_slot; 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_GROUP("Config file location"),
OPT_BOOLEAN(0, "global", &use_global_config, "use global config file"), 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, "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_STRING('f', "file", &given_config_file, "FILE", "use given config file"),
OPT_GROUP("Action"), OPT_GROUP("Action"),
OPT_BIT(0, "get", &actions, "get value: name [value-regex]", ACTION_GET), 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, builtin_config_usage,
PARSE_OPT_STOP_AT_NON_OPTION); 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."); error("only one config file at a time.");
usage_with_options(builtin_config_usage, builtin_config_options); 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) else if (use_system_config)
config_exclusive_filename = git_etc_gitconfig(); config_exclusive_filename = git_etc_gitconfig();
else if (use_local_config)
config_exclusive_filename = git_pathdup("config");
else if (given_config_file) { else if (given_config_file) {
if (!is_absolute_path(given_config_file) && prefix) if (!is_absolute_path(given_config_file) && prefix)
config_exclusive_filename = prefix_filename(prefix, config_exclusive_filename = prefix_filename(prefix,