common progress display support

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 671a5ff865b6ab891da4251ee3dd90892b13cbad..018cc75bd032fd337b559c14b85f51f0418447ff 100755 (executable)
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -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 is split wrong?"
+               exit 1
+       }
 
        # Parse the author information
        export GIT_AUTHOR_NAME=$(sed -ne 's/Author: //p' "$tmp_info")
@@ -111,7 +115,7 @@ 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) &&
+               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