ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: remove redundant check for undefined "merge-tools" section

Browse source 
The section should be defined by default.
This commit is contained in:
Yuya Nishihara 2023-01-24 11:55:19 +09:00
parent 337246ea51
commit 7b24df25e4
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/merge_tools.rs
View file

@ -421,11 +421,7 @@ impl MergeTool {
/// as an executable name if no configuration found for that name.
fn get_tool_config(settings: &UserSettings, name: &str) -> Result<MergeTool, ConfigError> {
const TABLE_KEY: &str = "merge-tools";
let tools_table = match settings.config().get_table(TABLE_KEY) {
Ok(table) => table,
Err(ConfigError::NotFound(_)) => return Ok(MergeTool::with_program(name)),
Err(err) => return Err(err),
};
let tools_table = settings.config().get_table(TABLE_KEY)?;
if let Some(v) = tools_table.get(name) {
let mut result: MergeTool = v
.clone()