• Denton Liu's avatar
    mergetool: use get_merge_tool function · 05fb8726
    Denton Liu authored
    In git-mergetool, the logic for getting which merge tool to use is
    duplicated in git-mergetool--lib, except for the fact that it needs to
    know whether the tool was guessed or not.
    Rewrite `get_merge_tool` to return whether or not the tool was guessed
    through the return code and make git-mergetool call this function
    instead of duplicating the logic. Note that 1 was chosen to be the
    return code of when a tool is guessed because it seems like a slightly
    more abnormal condition than getting a tool that's explicitly specified
    but this is completely arbitrary.
    Also, let `$GIT_MERGETOOL_GUI` be set to determine whether or not the
    guitool will be selected.
    This change is not completely backwards compatible as there may be
    external users of git-mergetool--lib. However, only one user,
    git-diffall[1], was found from searching GitHub and Google, and this
    tool is superseded by `git difftool --dir-diff` anyway. It seems very
    unlikely that there exists an external caller that would take into
    account the return code of `get_merge_tool` as it would always return 0
    before this change so this change probably does not affect any external
    [1]: https://github.com/thenigan/git-diffallSigned-off-by: Denton Liu's avatarDenton Liu <liu.denton@gmail.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
git-difftool--helper.sh 2.18 KB