]> git.ipfire.org Git - thirdparty/git.git/commit
mergetool: break setup_tool out into separate initialization function
authorSeth House <seth@eseth.com>
Tue, 9 Feb 2021 20:07:11 +0000 (13:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Feb 2021 22:09:16 +0000 (14:09 -0800)
commitde8dafbada811bc1bc8e1288541931f3c5406231
treeb565c165746b15098384e4578f977c16d894a2d1
parent98ea309b3fa4818c1591b9071925ccb22c2e786b
mergetool: break setup_tool out into separate initialization function

This is preparation for the following commit where we need to source the
mergetool shell script to look for overrides before `run_merge_tool` is
called. Previously `run_merge_tool` both sourced that script and invoked
the mergetool.

In the case of the following commit, we need the result of the
`hide_resolved` override, if present, before we actually run
`run_merge_tool`.

The new `initialize_merge_tool` wrapper is exposed and documented as
a public interface for consistency with the existing `run_merge_tool`
which is also public. Although `setup_tool` could instead be exposed
directly, the related `setup_user_tool` would probably also want to be
elevated to match and this felt the cleanest to me.

Signed-off-by: Seth House <seth@eseth.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-mergetool--lib.txt
git-difftool--helper.sh
git-mergetool--lib.sh
git-mergetool.sh