Prefix Dry- to the message status to denote dry-runs.

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 364baff80645efb225e433dbf5845e678df60760..a7a6757dd8a3e0ff2635537a83591169c259986f 100755 (executable)
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -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