| commit | 99474b6340dbcbe58f6c256fdee231cbadb060f4 | |
| author | David Aguilar <davvid@gmail.com> | |
| Fri, 14 Nov 2014 21:33:55 +0000 (14 13:33 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Nov 2014 21:40:38 +0000 (14 13:40 -0800) | ||
| tree | c8d1101df80627be58bae27951796598e7980247 | treesnapshot (tar.gz zip) |
| parent | 2b52123fcf840686b69e10807fd0f985ec4167f3 | commitdiff |
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>
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>
| git-mergetool--lib.sh | diffblobblamehistory | |
| t/t7800-difftool.sh | diffblobblamehistory |