kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'tb/config-default' 

Compilation fix.

* tb/config-default:
  builtin/config: work around an unsized array forward declaration
maint
Junio C Hamano 2018-07-24 14:50:46 -07:00
parent fa6758e9af 6aaded5509
commit 26a46437ec
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
builtin/config.c
View File

@ -67,7 +67,7 @@ static int show_origin;
{ OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \ { OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \
PARSE_OPT_NONEG, option_parse_type, (i) } PARSE_OPT_NONEG, option_parse_type, (i) }


static struct option builtin_config_options[]; static NORETURN void usage_builtin_config(void);


static int option_parse_type(const struct option *opt, const char *arg, static int option_parse_type(const struct option *opt, const char *arg,
int unset) int unset)
@ -111,8 +111,7 @@ static int option_parse_type(const struct option *opt, const char *arg,
* --type=int'. * --type=int'.
*/ */
error("only one type at a time."); error("only one type at a time.");
usage_with_options(builtin_config_usage, usage_builtin_config();
builtin_config_options);
} }
*to_type = new_type; *to_type = new_type;


@ -157,11 +156,16 @@ static struct option builtin_config_options[] = {
OPT_END(), OPT_END(),
}; };


static NORETURN void usage_builtin_config(void)
{
usage_with_options(builtin_config_usage, builtin_config_options);
}

static void check_argc(int argc, int min, int max) { static void check_argc(int argc, int min, int max) {
if (argc >= min && argc <= max) if (argc >= min && argc <= max)
return; return;
error("wrong number of arguments"); error("wrong number of arguments");
usage_with_options(builtin_config_usage, builtin_config_options); usage_builtin_config();
} }


static void show_config_origin(struct strbuf *buf) static void show_config_origin(struct strbuf *buf)
@ -596,7 +600,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
if (use_global_config + use_system_config + use_local_config + if (use_global_config + use_system_config + use_local_config +
!!given_config_source.file + !!given_config_source.blob > 1) { !!given_config_source.file + !!given_config_source.blob > 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_builtin_config();
} }


if (use_local_config && nongit) if (use_local_config && nongit)
@ -660,12 +664,12 @@ int cmd_config(int argc, const char **argv, const char *prefix)


if ((actions & (ACTION_GET_COLOR|ACTION_GET_COLORBOOL)) && type) { if ((actions & (ACTION_GET_COLOR|ACTION_GET_COLORBOOL)) && type) {
error("--get-color and variable type are incoherent"); error("--get-color and variable type are incoherent");
usage_with_options(builtin_config_usage, builtin_config_options); usage_builtin_config();
} }


if (HAS_MULTI_BITS(actions)) { if (HAS_MULTI_BITS(actions)) {
error("only one action at a time."); error("only one action at a time.");
usage_with_options(builtin_config_usage, builtin_config_options); usage_builtin_config();
} }
if (actions == 0) if (actions == 0)
switch (argc) { switch (argc) {
@ -673,25 +677,24 @@ int cmd_config(int argc, const char **argv, const char *prefix)
case 2: actions = ACTION_SET; break; case 2: actions = ACTION_SET; break;
case 3: actions = ACTION_SET_ALL; break; case 3: actions = ACTION_SET_ALL; break;
default: default:
usage_with_options(builtin_config_usage, builtin_config_options); usage_builtin_config();
} }
if (omit_values && if (omit_values &&
!(actions == ACTION_LIST || actions == ACTION_GET_REGEXP)) { !(actions == ACTION_LIST || actions == ACTION_GET_REGEXP)) {
error("--name-only is only applicable to --list or --get-regexp"); error("--name-only is only applicable to --list or --get-regexp");
usage_with_options(builtin_config_usage, builtin_config_options); usage_builtin_config();
} }


if (show_origin && !(actions & if (show_origin && !(actions &
(ACTION_GET|ACTION_GET_ALL|ACTION_GET_REGEXP|ACTION_LIST))) { (ACTION_GET|ACTION_GET_ALL|ACTION_GET_REGEXP|ACTION_LIST))) {
error("--show-origin is only applicable to --get, --get-all, " error("--show-origin is only applicable to --get, --get-all, "
"--get-regexp, and --list."); "--get-regexp, and --list.");
usage_with_options(builtin_config_usage, builtin_config_options); usage_builtin_config();
} }


if (default_value && !(actions & ACTION_GET)) { if (default_value && !(actions & ACTION_GET)) {
error("--default is only applicable to --get"); error("--default is only applicable to --get");
usage_with_options(builtin_config_usage, usage_builtin_config();
builtin_config_options);
} }


if (actions & PAGING_ACTIONS) if (actions & PAGING_ACTIONS)