[PATCH B v4 5/5] git config: don't allow --get-color* and variable type
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Feb 21, 2009, 00:49 UTC
- Message-ID
- <1235177369-2727-6-git-send-email-felipe.contreras@gmail.com>
- In-Reply-To
- <1235177369-2727-5-git-send-email-felipe.contreras@gmail.com>
Doing so would be incoherent since --get-color would pick a color slot and ignore the variable type option (e.g. --bool), and the type would require a variable name.
Suggested by Junio C Hamano.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- builtin-config.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/builtin-config.c b/builtin-config.c index 8045926..9930568 100644 --- a/builtin-config.c +++ b/builtin-config.c @@ -359,6 +359,11 @@ int cmd_config(int argc, const char **argv, const char *unused_prefix) if (get_colorbool_slot) actions |= ACTION_GET_COLORBOOL; + if ((get_color_slot || get_colorbool_slot) && types) { + error("--get-color and variable type are incoherent"); + usage_with_options(builtin_config_usage, builtin_config_options); + } + if (HAS_MULTI_BITS(actions)) { error("only one action at a time."); usage_with_options(builtin_config_usage, builtin_config_options);
-- 1.6.1.3