Merge branch 'np/verify-pack' into maint

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 84c8b8ef4fbfa55d503a10006f7f3cecee57391c..cebaee1cc9dfc28d80173583b144a480be2f9bfd 100755 (executable)
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\
-git-quiltimport [options]
+git quiltimport [options]
 --
 n,dry-run     dry run
 author=       author name and email address for patches without any
@@ -53,7 +53,7 @@ if ! [ -d "$QUILT_PATCHES" ] ; then
 fi
 
 # Temporary directories
-tmp_dir=.dotest
+tmp_dir="$GIT_DIR"/rebase-apply
 tmp_msg="$tmp_dir/msg"
 tmp_patch="$tmp_dir/patch"
 tmp_info="$tmp_dir/info"
@@ -67,7 +67,7 @@ while read patch_name level garbage
 do
        case "$patch_name" in ''|'#'*) continue;; esac
        case "$level" in
-       -p*);;
+       -p*)    ;;
        ''|'#'*)
                level=;;
        *)
@@ -129,7 +129,7 @@ do
        fi
 
        if [ -z "$dry_run" ] ; then
-               git apply --index -C1 $level "$tmp_patch" &&
+               git apply --index -C1 ${level:+"$level"} "$tmp_patch" &&
                tree=$(git write-tree) &&
                commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git commit-tree $tree -p $commit) &&
                git update-ref -m "quiltimport: $patch_name" HEAD $commit || exit 4