X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=afe322b20fb0b40dfeb1cb17dc3cad09096e943a;hb=fe142b3a4577a6692a39e2386ed649664ad8bd20;hp=d0af786aec3f797943290cdc63fa77f393900160;hpb=01aaf1f88ddc2b99162c302710339f202996f39b;p=git.git

diff --git a/git-am.sh b/git-am.sh
index d0af786ae..afe322b20 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -166,10 +166,25 @@ fi
 
 if test -d "$dotest"
 then
-	if test ",$#," != ",0," || ! tty -s
-	then
-		die "previous dotest directory $dotest still exists but mbox given."
-	fi
+	case "$#,$skip$resolved" in
+	0,*t*)
+		# Explicit resume command and we do not have file, so
+		# we are happy.
+		: ;;
+	0,)
+		# No file input but without resume parameters; catch
+		# user error to feed us a patch from standard input
+		# when there is already .dotest.  This is somewhat
+		# unreliable -- stdin could be /dev/null for example
+		# and the caller did not intend to feed us a patch but
+		# wanted to continue unattended.
+		tty -s
+		;;
+	*)
+		false
+		;;
+	esac ||
+	die "previous dotest directory $dotest still exists but mbox given."
 	resume=yes
 else
 	# Make sure we are not given --skip nor --resolved