X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-applymbox.sh;h=3efd6a746407bdc38ba9d251332427c508e5ee40;hb=d016a896d4a58a53dbb98cd85ebd033771413079;hp=7e690a16ee40c957b83770cf115190c53edd3013;hpb=62c89c662fc6220522adc009aa95b1392350ed20;p=git.git

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 7e690a16e..3efd6a746 100755
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -28,7 +28,7 @@ while case "$#" in 0) break ;; esac
 do
 	case "$1" in
 	-u)	utf8=-u ;;
-	-n)	utf8= ;;
+	-n)	utf8=-n ;;
 	-k)	keep_subject=-k ;;
 	-q)	query_apply=t ;;
 	-c)	continue="$2"; resume=f; shift ;;
@@ -77,6 +77,10 @@ do
     *)
 	    git-mailinfo $keep_subject $utf8 \
 		.dotest/msg .dotest/patch <$i >.dotest/info || exit 1
+	    test -s .dotest/patch || {
+		echo "Patch is empty.  Was is split wrong?"
+		exit 1
+	    }
 	    git-stripspace < .dotest/msg > .dotest/msg-clean
 	    ;;
     esac