From a1451104ac2aa97f2e74818787ff54e29b2a77e5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 12 Oct 2005 18:31:41 -0700 Subject: [PATCH] git-am: interactive should fail gracefully. When feeding patches from standard input, and --interactive is specified, quit, so that the user can re-run the command, instead of infinitely looping. Signed-off-by: Junio C Hamano --- git-am.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-am.sh b/git-am.sh index 9e41e70313..85d682669c 100755 --- a/git-am.sh +++ b/git-am.sh @@ -172,7 +172,6 @@ else echo "$sign" >"$dotest/sign" echo "$utf8" >"$dotest/utf8" echo "$keep" >"$dotest/keep" - echo "$threeway" >"$dotest/3way" echo 1 >"$dotest/next" fi @@ -193,7 +192,6 @@ then else SIGNOFF= fi -threeway=$(cat "$dotest/3way") last=`cat "$dotest/last"` this=`cat "$dotest/next"` @@ -256,6 +254,8 @@ do if test "$interactive" = t then + test -t 0 || + die "cannot be interactive without stdin connected to a terminal." action=again while test "$action" = again do