From: James Moger <james.moger@gitblit.com>
Date: Mon, 17 Mar 2014 13:31:52 +0000 (-0400)
Subject: Merge overrides in addition to merging the normal settings
X-Git-Tag: v1.4.1~4^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Ftickets%2F33%2F33%2F1;p=gitblit.git

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.
---

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