global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-23 23:20:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tb/mergetool-from-config'

Browse Source 
* tb/mergetool-from-config:
  git gui: add directly calling merge tool from configuration
This commit is contained in:
Johannes Sixt
2024-11-09 14:34:50 +01:00
parent 2864e85593 8ff65c7a53
commit 492550155a
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/mergetool.tcl
View File

@@ -272,8 +272,25 @@ proc merge_resolve_tool2 {} {
}
}
default {
error_popup [mc "Unsupported merge tool '%s'" $tool]
return
set tool_cmd [get_config mergetool.$tool.cmd]
if {$tool_cmd ne {}} {
if {([string first {[} $tool_cmd] != -1) || ([string first {]} $tool_cmd] != -1)} {
error_popup [mc "Unable to process square brackets in \"mergetool.%s.cmd\" configuration option.
Please remove the square brackets." $tool]
return
} else {
set cmdline {}
foreach command_part $tool_cmd {
lappend cmdline [subst -nobackslashes -nocommands $command_part]
}
}
} else {
error_popup [mc "Unsupported merge tool '%s'.
To use this tool, configure \"mergetool.%s.cmd\" as shown in the git-config manual page." $tool $tool]
return
}
}
}