Don't crash fast-import if the marks cannot be exported.

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 12d9d0cbc9e0c5df0f1094f3ff4235d8657c896e..2ae1f20c2e90a34ee9c1c37ffa239ff9fa0798c8 100755 (executable)
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -9,7 +9,7 @@ while case "$#" in 0) break;; esac
 do
        case "$1" in
        --au=*|--aut=*|--auth=*|--autho=*|--author=*)
-               quilt_author=$(expr "$1" : '-[^=]*\(.*\)')
+               quilt_author=$(expr "z$1" : 'z-[^=]*\(.*\)')
                shift
                ;;
 
@@ -26,7 +26,7 @@ do
                ;;
 
        --pa=*|--pat=*|--patc=*|--patch=*|--patche=*|--patches=*)
-               QUILT_PATCHES=$(expr "$1" : '-[^=]*\(.*\)')
+               QUILT_PATCHES=$(expr "z$1" : 'z-[^=]*\(.*\)')
                shift
                ;;
 
@@ -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
@@ -89,7 +89,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"
@@ -112,7 +112,7 @@ for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do
                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
+               git-update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4
        fi
 done
 rm -rf $tmp_dir || exit 5