diff options
| author | David Aguilar <davvid@gmail.com> | 2014-11-14 22:33:55 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-14 22:40:38 +0100 |
| commit | 99474b6340dbcbe58f6c256fdee231cbadb060f4 (patch) | |
| tree | c8d1101df80627be58bae27951796598e7980247 /patch-ids.c | |
| parent | difftool: add support for --trust-exit-code (diff) | |
| download | git-99474b6340dbcbe58f6c256fdee231cbadb060f4.tar.xz git-99474b6340dbcbe58f6c256fdee231cbadb060f4.zip | |
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 'patch-ids.c')
0 files changed, 0 insertions, 0 deletions