artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 19:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow defaultCommandset to be overridden (#25605)

Browse Source 
The new defaultCommandset does not respect an override in
sg.config.overwrite.yaml, so this adds that field to the merge function
so it will be respected.
This commit is contained in:
Camden Cheek 2021-10-01 10:22:01 -06:00 committed by GitHub
parent 4376334b53
commit dad129c2c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/sg/config.go
View File

@ -113,6 +113,10 @@ func (c *Config) Merge(other *Config) {
c.Commandsets[k] = v
}
if other.DefaultCommandset != "" {
c.DefaultCommandset = other.DefaultCommandset
}
for k, v := range other.Tests {
if original, ok := c.Tests[k]; ok {
c.Tests[k] = original.Merge(v)