mirror of
https://github.com/git/git.git
synced 2026-01-10 10:13:33 +00:00
difftool--helper: exit when reading a prompt answer fails
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 <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
3c2dc76f01
commit
25098690a0
@@ -49,7 +49,8 @@ launch_merge_tool () {
|
||||
else
|
||||
printf "Launch '%s' [Y/n]: " "$merge_tool"
|
||||
fi
|
||||
if read ans && test "$ans" = n
|
||||
read ans || return
|
||||
if test "$ans" = n
|
||||
then
|
||||
return
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user