From: Junio C Hamano <junkio@cox.net>
Date: Sat, 17 Mar 2007 04:22:05 +0000 (-0700)
Subject: applymbox: brown paper bag fix.
X-Git-Tag: v1.5.1-rc1~24
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0d38ab259e074cd0962451075faf120c416a0706;p=git.git

applymbox: brown paper bag fix.

An earlier patch 87ab7992 broke applymbox by blindly copying piece
from git-am, causing a harmless but annoying series of error messages.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-applymbox.sh b/git-applymbox.sh
index 2cbdc7eb3..3efd6a746 100755
--- a/git-applymbox.sh
+++ b/git-applymbox.sh
@@ -77,9 +77,9 @@ do
     *)
 	    git-mailinfo $keep_subject $utf8 \
 		.dotest/msg .dotest/patch <$i >.dotest/info || exit 1
-	    test -s $dotest/patch || {
+	    test -s .dotest/patch || {
 		echo "Patch is empty.  Was is split wrong?"
-		stop_here $this
+		exit 1
 	    }
 	    git-stripspace < .dotest/msg > .dotest/msg-clean
 	    ;;