Mikael Magnusson 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
>>>
David Aguilar 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>
> Signed-off-by: David
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 wrote:
> > David Aguilar writes:
> >
> >> run_merge_tool() was not setting $status, which prevented the
> >> exit code for builtin tools from being forwarded to the caller.
> >>
>
On Fri, Nov 14, 2014 at 10:51 PM, Junio C Hamano wrote:
> David Aguilar 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.
>>
>> Repor
014 00:10:12 +0100
> From: Adri Farr <14farr...@gmail.com>
> To: David Aguilar
> 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 for the time put into this. I sh
essage from Adri Farr <14farr...@gmail.com> -
Date: Sat, 15 Nov 2014 00:10:12 +0100
From: Adri Farr <14farr...@gmail.com>
To: David Aguilar
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
On Fri, Nov 14, 2014 at 01:51:39PM -0800, Junio C Hamano wrote:
> David Aguilar 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.
David Aguilar 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>
> Signed-off-by: David
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
---
git-mergetool--lib.sh
9 matches
Mail list logo
