Re: difftool--helper: exit when reading a prompt answer fails

2014-10-27 Thread Junio C Hamano
David Aguilar writes: >> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh >> index dc30a51..9cf5dc9 100755 >> --- a/t/t7800-difftool.sh >> +++ b/t/t7800-difftool.sh >> @@ -301,6 +301,14 @@ test_expect_success PERL 'say no to the second file' ' >> ! grep br2 output >> ' >> >> +test_e

Re: difftool--helper: exit when reading a prompt answer fails

2014-10-27 Thread Michael J Gruber
David Aguilar schrieb am 27.10.2014 um 02:10: > On Sun, Oct 26, 2014 at 05:41:49PM -0700, David Aguilar wrote: >> On Sun, Oct 26, 2014 at 09:09:20AM +0100, Johannes Sixt wrote: >>> An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does >>> not quit it, but is treated as if 'yes' was

Re: difftool--helper: exit when reading a prompt answer fails

2014-10-26 Thread David Aguilar
On Sun, Oct 26, 2014 at 05:41:49PM -0700, David Aguilar wrote: > On Sun, Oct 26, 2014 at 09:09:20AM +0100, Johannes Sixt wrote: > > An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does > > not quit it, but is treated as if 'yes' was answered to the prompt and > > all following pro

Re: difftool--helper: exit when reading a prompt answer fails

2014-10-26 Thread David Aguilar
On Sun, Oct 26, 2014 at 09:09:20AM +0100, Johannes Sixt wrote: > An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does > not quit it, but is treated as if 'yes' was answered to the prompt and > all following prompts, which is contrary to the user's intent. Fix the > error check. >

difftool--helper: exit when reading a prompt answer fails

2014-10-26 Thread Johannes Sixt
An attempt to quit difftool by hitting Ctrl-D (EOF) at its prompt does not quit it, but is treated as if 'yes' was answered to the prompt and all following prompts, which is contrary to the user's intent. Fix the error check. Signed-off-by: Johannes Sixt --- Found while reviewing your latest pat