From 99474b6340dbcbe58f6c256fdee231cbadb060f4 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Fri, 14 Nov 2014 13:33:55 -0800 Subject: 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 Signed-off-by: Junio C Hamano --- git-mergetool--lib.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'git-mergetool--lib.sh') 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 } -- cgit v1.2.3