Merge branch 'scalar-reconfigure'

This allows fixing settings after a Scalar upgrade, or after botching
the enlistments configuration.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

scalar.c

@@ -200,6 +200,23 @@ static int set_recommended_config(int reconfigure)
 	int i;
 	char *value;
 
+	/*
+	 * If a user has "core.usebuiltinfsmonitor" enabled, try to switch to
+	 * the new (non-deprecated) setting (core.fsmonitor).
+	 */
+	if (!git_config_get_string("core.usebuiltinfsmonitor", &value)) {
+		char *dummy = NULL;
+		if (git_config_get_string("core.fsmonitor", &dummy) &&
+		    git_config_set_gently("core.fsmonitor", value) < 0)
+			return error(_("could not configure %s=%s"),
+				     "core.fsmonitor", value);
+		if (git_config_set_gently("core.usebuiltinfsmonitor", NULL) < 0)
+			return error(_("could not configure %s=%s"),
+				     "core.useBuiltinFSMonitor", "NULL");
+		free(value);
+		free(dummy);
+	}
+
 	for (i = 0; config[i].key; i++) {
 		if (set_scalar_config(config + i, reconfigure))
 			return error(_("could not configure %s=%s"),
@@ -1141,7 +1158,8 @@ static int cmd_reconfigure(int argc, const char **argv)
 		old_repo = the_repository;
 		the_repository = &r;
 
-		if (set_recommended_config(1) >= 0)
+		if (set_recommended_config(1) >= 0 &&
+		    toggle_maintenance(1) >= 0)
 			succeeded = 1;
 
 		the_repository = old_repo;