diff options
| author | David Aguilar <davvid@gmail.com> | 2014-11-14 13:33:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-14 13:40:38 -0800 |
| commit | 99474b6340dbcbe58f6c256fdee231cbadb060f4 (patch) | |
| tree | c8d1101df80627be58bae27951796598e7980247 /git-mergetool--lib.sh | |
| parent | 2b52123fcf840686b69e10807fd0f985ec4167f3 (diff) | |
| download | git-99474b6340dbcbe58f6c256fdee231cbadb060f4.tar.gz | |
difftool: honor --trust-exit-code for builtin tools
run_merge_tool() was not setting $status, which prevented the
exit code for builtin tools from being forwarded to the caller.
Capture the exit status and add a test to guarantee the behavior.
Reported-by: Adria Farres <14farresa@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index c45a020301..cce4f8c494 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -221,6 +221,7 @@ run_merge_tool () { else run_diff_cmd "$1" fi + status=$? return $status } |