@matheusbsbs / matheus-bagliano / commits / 67d454fed6
Fork 0

Add an option to specify a file to config builtin

There are (really!) systems where using environment variables is very cumbersome (yes, Windows, it has problems unsetting them). Besides this form is shorter. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Alex Riesen committed Jul 31, 2007 at 11:58 UTC 67d454fed6ae1f127d2daa57db946df200f2382a
2 files changed +24 -14
Documentation/git-config.txt
+16 -13
@@ -9,17 +9,17 @@ git-config - Get and set repository or global options
9 SYNOPSIS
10 --------
11 [verse]
12 -'git-config' [--system | --global] [type] [-z|--null] name [value [value_regex]]
13 -'git-config' [--system | --global] [type] --add name value
14 -'git-config' [--system | --global] [type] --replace-all name [value [value_regex]]
15 -'git-config' [--system | --global] [type] [-z|--null] --get name [value_regex]
16 -'git-config' [--system | --global] [type] [-z|--null] --get-all name [value_regex]
17 -'git-config' [--system | --global] [type] [-z|--null] --get-regexp name_regex [value_regex]
18 -'git-config' [--system | --global] --unset name [value_regex]
19 -'git-config' [--system | --global] --unset-all name [value_regex]
20 -'git-config' [--system | --global] --rename-section old_name new_name
21 -'git-config' [--system | --global] --remove-section name
22 -'git-config' [--system | --global] [-z|--null] -l | --list
12 +'git-config' [--system | --global | [-f|--file] config-file] [type] [-z|--null] name [value [value_regex]]
13 +'git-config' [--system | --global | [-f|--file] config-file] [type] --add name value
14 +'git-config' [--system | --global | [-f|--file] config-file] [type] --replace-all name [value [value_regex]]
15 +'git-config' [--system | --global | [-f|--file] config-file] [type] [-z|--null] --get name [value_regex]
16 +'git-config' [--system | --global | [-f|--file] config-file] [type] [-z|--null] --get-all name [value_regex]
17 +'git-config' [--system | --global | [-f|--file] config-file] [type] [-z|--null] --get-regexp name_regex [value_regex]
18 +'git-config' [--system | --global | [-f|--file] config-file] --unset name [value_regex]
19 +'git-config' [--system | --global | [-f|--file] config-file] --unset-all name [value_regex]
20 +'git-config' [--system | --global | [-f|--file] config-file] --rename-section old_name new_name
21 +'git-config' [--system | --global | [-f|--file] config-file] --remove-section name
22 +'git-config' [--system | --global | [-f|--file] config-file] [-z|--null] -l | --list
23
24 DESCRIPTION
25 -----------
@@ -42,8 +42,8 @@ no checks or transformations are performed on the value.
42
43 This command will fail if:
44
45 -. The .git/config file is invalid,
46 -. Can not write to .git/config,
45 +. The config file is invalid,
46 +. Can not write to the config file,
47 . no section was provided,
48 . the section or key is invalid,
49 . you try to unset an option which does not exist,
@@ -93,6 +93,9 @@ rather than from all available files.
93 +
94 See also <<FILES>>.
95
96 +-f config-file, --file config-file::
97 + Use the given config file instead of the one specified by GIT_CONFIG.
98 +
99 --remove-section::
100 Remove the given section from the configuration file.
101
builtin-config.c
+8 -1
@@ -2,7 +2,7 @@
2 #include "cache.h"
3
4 static const char git_config_set_usage[] =
5 -"git-config [ --global | --system ] [ --bool | --int ] [ -z | --null ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list";
5 +"git-config [ --global | --system | [ -f | --file ] config-file ] [ --bool | --int ] [ -z | --null ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list";
6
7 static char *key;
8 static regex_t *key_regexp;
@@ -186,6 +186,13 @@ int cmd_config(int argc, const char **argv, const char *prefix)
186 }
187 else if (!strcmp(argv[1], "--system"))
188 setenv(CONFIG_ENVIRONMENT, ETC_GITCONFIG, 1);
189 + else if (!strcmp(argv[1], "--file") || !strcmp(argv[1], "-f")) {
190 + if (argc < 3)
191 + usage(git_config_set_usage);
192 + setenv(CONFIG_ENVIRONMENT, argv[2], 1);
193 + argc--;
194 + argv++;
195 + }
196 else if (!strcmp(argv[1], "--null") || !strcmp(argv[1], "-z")) {
197 term = '\0';
198 delim = '\n';