Skip to content

git gui: add directly calling merge tool from gitconfig #1773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

git gui: add directly calling merge tool from gitconfig #1773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions git-gui/lib/mergetool.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,26 @@ 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.$tool.cmd configuration option.

Please remove the square brackets."]
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
}
}
}

Expand Down
Loading