test&lint&fmt
This commit is contained in:
@@ -80,7 +80,7 @@ config.get = function()
|
|||||||
'get',
|
'get',
|
||||||
'onetime',
|
'onetime',
|
||||||
global_config.revision or 0,
|
global_config.revision or 0,
|
||||||
onetime_config.revision or 0
|
onetime_config.revision or 0,
|
||||||
}, function()
|
}, function()
|
||||||
return misc.merge(config.normalize(onetime_config), config.normalize(global_config))
|
return misc.merge(config.normalize(onetime_config), config.normalize(global_config))
|
||||||
end)
|
end)
|
||||||
@@ -92,7 +92,7 @@ config.get = function()
|
|||||||
'cmdline',
|
'cmdline',
|
||||||
global_config.revision or 0,
|
global_config.revision or 0,
|
||||||
cmdtype,
|
cmdtype,
|
||||||
cmdline_config.revision or 0
|
cmdline_config.revision or 0,
|
||||||
}, function()
|
}, function()
|
||||||
return misc.merge(config.normalize(cmdline_config), config.normalize(global_config))
|
return misc.merge(config.normalize(cmdline_config), config.normalize(global_config))
|
||||||
end)
|
end)
|
||||||
|
|||||||
Reference in New Issue
Block a user