Merge branch 'tb/config-default'

Compilation fix.

* tb/config-default:
builtin/config: work around an unsized array forward declaration

diff --combined builtin/config.c
index b29d26dede79b9a5c46bdc4f951b22e7b88310b3,704879a70c4db214d7b10232e781968a3f4416f5..2c93a289a7255c69260a806cc064f00170453531
--- 1/builtin/config.c
--- 2/builtin/config.c
+++ b/builtin/config.c
@@@ -67,7 -67,7 +67,7 @@@ static int show_origin
        { OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \
        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,
                             int unset)
@@@ -111,8 -111,7 +111,7 @@@
                 * --type=int'.
                 */
                error("only one type at a time.");
-               usage_with_options(builtin_config_usage,
-                       builtin_config_options);
+               usage_builtin_config();
        }
        *to_type = new_type;
  
@@@ -157,11 -156,16 +156,16 @@@ static struct option builtin_config_opt
        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) {
        if (argc >= min && argc <= max)
                return;
        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)
@@@ -398,7 -402,7 +402,7 @@@ static char *normalize_value(const cha
                return xstrdup(value);
        }
  
 -      die("BUG: cannot normalize type %d", type);
 +      BUG("cannot normalize type %d", type);
  }
  
  static int get_color_found;
@@@ -596,15 -600,12 +600,15 @@@ int cmd_config(int argc, const char **a
        if (use_global_config + use_system_config + use_local_config +
            !!given_config_source.file + !!given_config_source.blob > 1) {
                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)
                die(_("--local can only be used inside a git repository"));
  
 +      if (given_config_source.blob && nongit)
 +              die(_("--blob can only be used inside a git repository"));
 +
        if (given_config_source.file &&
                        !strcmp(given_config_source.file, "-")) {
                given_config_source.file = NULL;
@@@ -660,12 -661,12 +664,12 @@@
  
        if ((actions & (ACTION_GET_COLOR|ACTION_GET_COLORBOOL)) && type) {
                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)) {
                error("only one action at a time.");
-               usage_with_options(builtin_config_usage, builtin_config_options);
+               usage_builtin_config();
        }
        if (actions == 0)
                switch (argc) {
@@@ -673,25 -674,24 +677,24 @@@
                case 2: actions = ACTION_SET; break;
                case 3: actions = ACTION_SET_ALL; break;
                default:
-                       usage_with_options(builtin_config_usage, builtin_config_options);
+                       usage_builtin_config();
                }
        if (omit_values &&
            !(actions == ACTION_LIST || actions == ACTION_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 &
                (ACTION_GET|ACTION_GET_ALL|ACTION_GET_REGEXP|ACTION_LIST))) {
                error("--show-origin is only applicable to --get, --get-all, "
                          "--get-regexp, and --list.");
-               usage_with_options(builtin_config_usage, builtin_config_options);
+               usage_builtin_config();
        }
  
        if (default_value && !(actions & ACTION_GET)) {
                error("--default is only applicable to --get");
-               usage_with_options(builtin_config_usage,
-                       builtin_config_options);
+               usage_builtin_config();
        }
  
        if (actions & PAGING_ACTIONS)