From 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 17 Mar 2014 09:31:52 -0400 Subject: [PATCH] Merge overrides in addition to merging the normal settings Some command-line parameters are ignored due to a bug in the merge settings method which merges overrides into the normal settings map. This works fine until the settings class decides to reload from the pristine settings file which dumps the explicitly overrides. The solution is to merge the overrides in addition to the standard settings. --- src/main/java/com/gitblit/IStoredSettings.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/gitblit/IStoredSettings.java b/src/main/java/com/gitblit/IStoredSettings.java index 6b58e89a..9c7a2d23 100644 --- a/src/main/java/com/gitblit/IStoredSettings.java +++ b/src/main/java/com/gitblit/IStoredSettings.java @@ -359,5 +359,6 @@ public abstract class IStoredSettings { */ public void merge(IStoredSettings settings) { getSettings().putAll(settings.getSettings()); + overrides.putAll(settings.overrides); } } \ No newline at end of file -- 2.39.5