diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-10-01 12:58:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-01 12:58:57 -0700 |
| commit | 5ec11ab39d11aecd731044955a7a4f7e925cdba6 (patch) | |
| tree | 87432ee7fd9345d922f2fa7d182246125cc3b61d /mergetools | |
| parent | Merge branch 'os/commit-submodule-ignore' (diff) | |
| parent | mergetool--lib: Allow custom commands to override built-ins (diff) | |
| download | tgif-5ec11ab39d11aecd731044955a7a4f7e925cdba6.tar.xz | |
Merge branch 'da/mergetool-custom'
The actual external command to run for mergetool backend can be
specified with difftool/mergetool.$name.cmd configuration
variables, but this mechanism was ignored for the backends we
natively support.
* da/mergetool-custom:
mergetool--lib: Allow custom commands to override built-ins
Diffstat (limited to 'mergetools')
| -rw-r--r-- | mergetools/defaults | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/mergetools/defaults b/mergetools/defaults index 1d8f2a3dd3..21e63ecc3e 100644 --- a/mergetools/defaults +++ b/mergetools/defaults @@ -8,36 +8,12 @@ can_diff () { } diff_cmd () { - merge_tool_cmd="$(get_merge_tool_cmd "$1")" - if test -z "$merge_tool_cmd" - then - status=1 - break - fi - ( eval $merge_tool_cmd ) - status=$? + status=1 return $status } merge_cmd () { - merge_tool_cmd="$(get_merge_tool_cmd "$1")" - if test -z "$merge_tool_cmd" - then - status=1 - break - fi - trust_exit_code="$(git config --bool \ - mergetool."$1".trustExitCode || echo false)" - if test "$trust_exit_code" = "false" - then - touch "$BACKUP" - ( eval $merge_tool_cmd ) - status=$? - check_unchanged - else - ( eval $merge_tool_cmd ) - status=$? - fi + status=1 return $status } |