]> source.dussan.org Git - gitblit.git/commit
projects / gitblit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f8c1913) | patch
Merge overrides in addition to merging the normal settings 33/33/1
authorJames Moger <james.moger@gitblit.com>
Mon, 17 Mar 2014 13:31:52 +0000 (09:31 -0400)
committerJames Moger <james.moger@gitblit.com>
Mon, 17 Mar 2014 13:31:52 +0000 (09:31 -0400)
commit08704c63e1c5d8a089d0dba58c5fa3ba119a32a7
tree9ee44978c1f7be14f50c2f42981142cf26ff6bb9tree | snapshot
parentf8c1913bd9fb332bfa3ff722f6870216d5194c6fcommit | diff
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 diff | blob | history
Pure java git solution: https://github.com/gitblit-org/gitblit