git-mergetool: check return value from read
Mostly fixed already by 6b44577 (mergetool: check return value from read, 2011-07-01). Catch two uses it missed. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jay Soffian committed
Sep 19, 2011 at 19:40 UTC
e622f41dcd97861796c7529712170f9eae07dc56
2 files changed
+2
-2
git-mergetool--lib.sh
+1
-1
@@ -38,7 +38,7 @@ check_unchanged () {
38
while true; do
39
echo "$MERGED seems unchanged."
40
printf "Was the merge successful? [y/n] "
41
- read answer
41
+ read answer || return 1
42
case "$answer" in
43
y*|Y*) status=0; break ;;
44
n*|N*) status=1; break ;;
git-mergetool.sh
+1
-1
@@ -72,7 +72,7 @@ describe_file () {
72
resolve_symlink_merge () {
73
while true; do
74
printf "Use (l)ocal or (r)emote, or (a)bort? "
75
- read ans
75
+ read ans || return 1
76
case "$ans" in
77
[lL]*)
78
git checkout-index -f --stage=2 -- "$MERGED"