Merge branch 'maint'

diff --git a/builtin/update-server-info.c b/builtin/update-server-info.c
index 2b3fddcc69087d856b6a9c9f4383c5577a759c77..0d63c4498c0c10193846c020a2d76958bd12e1bd 100644 (file)
--- a/builtin/update-server-info.c
+++ b/builtin/update-server-info.c
@@ -11,11 +11,11 @@ int cmd_update_server_info(int argc, const char **argv, const char *prefix)
 {
        int force = 0;
        struct option options[] = {
-               OPT_BOOLEAN('f', "force", &force,
-                       "update the info files from scratch"),
+               OPT__FORCE(&force, "update the info files from scratch"),
                OPT_END()
        };
 
+       git_config(git_default_config, NULL);
        argc = parse_options(argc, argv, prefix, options,
                             update_server_info_usage, 0);
        if (argc > 0)