From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Apr 2007 21:34:18 +0000 (-0700)
Subject: git-quiltimport complaining yet still working
X-Git-Tag: v1.5.1.2~34
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1fa9bf362acbe2c939c246684ab0fe59aec74ba8;p=git.git

git-quiltimport complaining yet still working

There were two bugs: "stop_here" doesn't exist, but the bug that causes
this code to trigger in the *first* place is the wrong use of "$dotest".
It should be ".dotest"

This is essentially the same bug introduced by 87ab7992, one was
fixed with 0d38ab25 but this was somehow left behind.

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

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index edccd8275..018cc75bd 100755
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -73,9 +73,9 @@ mkdir $tmp_dir || exit 2
 for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do
 	echo $patch_name
 	(cat $QUILT_PATCHES/$patch_name | git-mailinfo "$tmp_msg" "$tmp_patch" > "$tmp_info") || exit 3
-	test -s $dotest/patch || {
+	test -s .dotest/patch || {
 		echo "Patch is empty.  Was is split wrong?"
-		stop_here $this
+		exit 1
 	}
 
 	# Parse the author information