X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=f43a75b04bf692b9ff6acaae0f6bbe51369aa399;hb=dbdc07fcbe3a951df8a3869b42edb6fffd466486;hp=9042432e23d7e43edafce28b6822a041028b57b7;hpb=14ba45a2e68c296cb2b5bc5e77fdaa0846fb77de;p=git.git

diff --git a/git-am.sh b/git-am.sh
index 9042432e2..f43a75b04 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -201,7 +201,7 @@ check_patch_format () {
 		l1=
 		while test -z "$l1"
 		do
-			read l1
+			read l1 || break
 		done
 		read l2
 		read l3
@@ -530,7 +530,6 @@ else
 	echo "$sign" >"$dotest/sign"
 	echo "$utf8" >"$dotest/utf8"
 	echo "$keep" >"$dotest/keep"
-	echo "$keepcr" >"$dotest/keepcr"
 	echo "$scissors" >"$dotest/scissors"
 	echo "$no_inbody_headers" >"$dotest/no_inbody_headers"
 	echo "$GIT_QUIET" >"$dotest/quiet"
@@ -576,12 +575,6 @@ if test "$(cat "$dotest/keep")" = t
 then
 	keep=-k
 fi
-case "$(cat "$dotest/keepcr")" in
-t)
-	keepcr=--keep-cr ;;
-f)
-	keepcr=--no-keep-cr ;;
-esac
 case "$(cat "$dotest/scissors")" in
 t)
 	scissors=--scissors ;;