From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Apr 2007 21:34:18 GMT
Subject: Re: git-quiltimport complaining yet still working
Message-ID: <Pine.LNX.4.64.0704131431040.28042@woody.linux-foundation.org>
In-Reply-To: <20070413203837.GA27660@kroah.com>



On Fri, 13 Apr 2007, Greg KH wrote:
>
> In git 1.5.1 the quiltimport function started complaining in a new way:
> 
> 	libata-clear-tf-before-doing-request-sense.patch
> 	Patch is empty.  Was is split wrong?
> 	/usr/bin/git-quiltimport: line 78: stop_here: command not found

This is an *old* bug. It got fixed once already. Did it get re-introduced?

Ahh - somebody copied the bug from git-applymbox

> Any hints?  Or is it time to start bisecting?

This should fix it.

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"

		Linus

---
diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index edccd82..018cc75 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