Re: [PATCH v3 2/2] difftool: add support for --trust-exit-code

2014-10-28 Thread David Aguilar
On Mon, Oct 27, 2014 at 11:45:14AM -0700, Junio C Hamano wrote: > David Aguilar writes: > > > +write_script .git/fail-right-file <<\EOF > > +echo "$2" > > +exit 1 > > +EOF > > This should be inside the next one, no? > > > +test_expect_success PERL 'difftool stops on error with --trust-exit-code

Re: [PATCH v3 2/2] difftool: add support for --trust-exit-code

2014-10-27 Thread Junio C Hamano
David Aguilar writes: > +write_script .git/fail-right-file <<\EOF > +echo "$2" > +exit 1 > +EOF This should be inside the next one, no? > +test_expect_success PERL 'difftool stops on error with --trust-exit-code' ' > + >for-diff && > + git add for-diff && > + echo file>expect && > +

[PATCH v3 2/2] difftool: add support for --trust-exit-code

2014-10-26 Thread David Aguilar
Teach difftool to exit when a diff tool returns a non-zero exit code when either --trust-exit-code is specified or difftool.trustExitCode is true. Forward exit codes from invoked diff tools to the caller when --trust-exit-code is used. Suggested-by: Adri Farr <14farr...@gmail.com> Helped-by: Joha