At 10:11 -0800 16 Nov 2014, Junio C Hamano gits...@pobox.com wrote:
It does not have any significance that a random shell implementation
is not POSIX compliant. That would merely mean that such a shell
cannot be used to run POSIX shell scripts like our Porcelain.
Right, and I suspect that
David Aguilar dav...@gmail.com writes:
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 14farr...@gmail.com
Mikael Magnusson mika...@gmail.com writes:
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index a40d3df..2b66351 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -221,6 +221,7 @@ run_merge_tool () {
else
run_diff_cmd $1
fi
+
: honor --trust-exit-code for builtin tools
I have tested this patch both in vim and meld and it works
wonderfully. Thank you for the time put into this. I should have
provided feedback back when the patch was proposed. I guess it's never
too late :).
2014-11-14 22:57 GMT+01:00 David Aguilar dav
On Fri, Nov 14, 2014 at 10:51 PM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com writes:
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
On Sun, Nov 16, 2014 at 02:51:11AM +0100, Mikael Magnusson wrote:
On Fri, Nov 14, 2014 at 10:51 PM, Junio C Hamano gits...@pobox.com wrote:
David Aguilar dav...@gmail.com writes:
run_merge_tool() was not setting $status, which prevented the
exit code for builtin tools from being forwarded
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 14farr...@gmail.com
Signed-off-by: David Aguilar dav...@gmail.com
---
David Aguilar dav...@gmail.com writes:
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 14farr...@gmail.com
On Fri, Nov 14, 2014 at 01:51:39PM -0800, Junio C Hamano wrote:
David Aguilar dav...@gmail.com writes:
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
14farr...@gmail.com -
Date: Sat, 15 Nov 2014 00:10:12 +0100
From: Adri Farr 14farr...@gmail.com
To: David Aguilar dav...@gmail.com
Subject: Re: [PATCH] difftool: honor --trust-exit-code for builtin tools
I have tested this patch both in vim and meld and it works
wonderfully. Thank you
10 matches
Mail list logo
