Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git config: don't allow multiple config file locations
author
Felipe Contreras
<felipe.contreras@gmail.com>
Sat, 21 Feb 2009 00:49:26 +0000
(
02:49
+0200)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 22 Feb 2009 04:37:44 +0000
(20:37 -0800)
Either --global, --system, or --file can be used, but not any
combination.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-config.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
d64ec16
)
diff --git
a/builtin-config.c
b/builtin-config.c
index 08a77cd7df4c834eb6cde85d3840713848e43e03..d037e4745c139b1491e5cd344ebf1f24cd8111c0 100644
(file)
--- a/
builtin-config.c
+++ b/
builtin-config.c
@@
-316,6
+316,11
@@
int cmd_config(int argc, const char **argv, const char *unused_prefix)
argc = parse_options(argc, argv, builtin_config_options, builtin_config_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
+ if (use_global_config + use_system_config + !!given_config_file > 1) {
+ error("only one config file at a time.");
+ usage_with_options(builtin_config_usage, builtin_config_options);
+ }
+
if (use_global_config) {
char *home = getenv("HOME");
if (home) {