From: Don Zickus <dzickus@gmail.com>
Date: Fri, 13 Apr 2007 21:13:58 GMT
Subject: Re: git-quiltimport complaining yet still working
Message-ID: <68948ca0704131413t687c7196h70c6cc8c316b640e@mail.gmail.com>
In-Reply-To: <20070413203837.GA27660@kroah.com>

On 4/13/07, Greg KH <greg@kroah.com> 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

Sorry about that.  I assumed all the scripts using git-mailinfo had
the stop_here command.  Not sure why I made that assumption.

I changed the behaviour of git-mailinfo to allow empty patches and
have the scripts check if a patch was empty and fail.  Unfortunately,
I incorrectly applied the change to git-quiltimport.

Anyway the following should fix it.

Signed-off-by: Don Zickus <dzickus@redhat.com>


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