[PATCH] Abort mergetool on read error from stdinput

From: Robin Rosenberg <robin.rosenberg@dewire.com>
Date: Dec 2, 2010, 06:28 UTC
Message-ID: <1291271301-12511-1-git-send-email-robin.rosenberg@dewire.com>

If you press e.g Ctrl-C the interactive merge goes into an infinite loop that is somewhat tricky to stop. Abort the script if bash read fails.

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---
 git-mergetool--lib.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 77d4aee..2fc2886 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -35,7 +35,7 @@ check_unchanged () {
 		while true; do
 			echo "$MERGED seems unchanged."
 			printf "Was the merge successful? [y/n] "
-			read answer
+			read answer < /dev/tty || exit 1
 			case "$answer" in
 			y*|Y*) status=0; break ;;
 			n*|N*) status=1; break ;;

-- 
1.7.2.3