X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-quiltimport.sh;h=a7a6757dd8a3e0ff2635537a83591169c259986f;hb=e448ff877b5bff0f2e6c5281652ed5183a41ed6c;hp=86b51abd21748c19235a703b1b523525d05383cd;hpb=b296990c3bcf942dc7601b31a901c7714a353a0a;p=git.git

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 86b51abd2..a7a6757dd 100755
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -49,7 +49,7 @@ if [ -n "$quilt_author" ] ; then
 	quilt_author_email=$(expr "z$quilt_author" : '.*<\([^>]*\)') &&
 	test '' != "$quilt_author_name" &&
 	test '' != "$quilt_author_email" ||
-	die "malformatted --author parameter"
+	die "malformed --author parameter"
 fi
 
 # Quilt patch directory
@@ -59,7 +59,7 @@ if ! [ -d "$QUILT_PATCHES" ] ; then
 	exit 1
 fi
 
-# Temporay directories
+# Temporary directories
 tmp_dir=.dotest
 tmp_msg="$tmp_dir/msg"
 tmp_patch="$tmp_dir/patch"
@@ -73,6 +73,10 @@ 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 || {
+		echo "Patch is empty.  Was it split wrong?"
+		exit 1
+	}
 
 	# Parse the author information
 	export GIT_AUTHOR_NAME=$(sed -ne 's/Author: //p' "$tmp_info")
@@ -89,7 +93,7 @@ for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do
 			echo "No author found in $patch_name" >&2;
 			echo "---"
 			cat $tmp_msg
-			echo -n "Author: ";
+			printf "Author: ";
 			read patch_author
 
 			echo "$patch_author"
@@ -111,8 +115,8 @@ for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do
 	if [ -z "$dry_run" ] ; then
 		git-apply --index -C1 "$tmp_patch" &&
 		tree=$(git-write-tree) &&
-		commit=$((echo "$SUBJECT"; echo; cat "$tmp_msg") | git-commit-tree $tree -p $commit) &&
-		git-update-ref HEAD $commit || exit 4
+		commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git-commit-tree $tree -p $commit) &&
+		git-update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4
 	fi
 done
 rm -rf $tmp_dir || exit 5