[PATCH] git-mergetool--lib.sh: make check_unchanged return 1 on invalid read
From: Jay Soffian <hidden>
Date: 2016-06-15 22:52:04
Subsystem:
the rest · Maintainer:
Linus Torvalds
Else when the user hits ctrl-c at the "Was the merge successful? [y/n]" prompt, mergetool goes into an infinite loop asking for input. Signed-off-by: Jay Soffian <redacted> --- git-mergetool--lib.sh | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 8fc65d0400..0eb424484c 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh@@ -21,7 +21,11 @@ check_unchanged () { do echo "$MERGED seems unchanged." printf "Was the merge successful? [y/n] " - read answer + if ! read answer + then + status=1 + break + fi case "$answer" in y*|Y*) status=0; break ;; n*|N*) status=1; break ;;
--
1.7.7.rc2.2.gf185