pack-objects: don't include missing preferred base objects

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index dd4a198fb173db8513d3f8edc74bc591f6b15d1c..cebaee1cc9dfc28d80173583b144a480be2f9bfd 100755 (executable)
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -1,40 +1,39 @@
 #!/bin/sh
-USAGE='--author <author> --patches </path/to/quilt/patch/directory>'
+OPTIONS_KEEPDASHDASH=
+OPTIONS_SPEC="\
+git quiltimport [options]
+--
+n,dry-run     dry run
+author=       author name and email address for patches without any
+patches=      path to the quilt series and patches
+"
 SUBDIRECTORY_ON=Yes
 . git-sh-setup
 
+dry_run=""
 quilt_author=""
-while case "$#" in 0) break;; esac
+while test $# != 0
 do
        case "$1" in
-       --au=*|--aut=*|--auth=*|--autho=*|--author=*)
-               quilt_author=$(expr "$1" : '-[^=]*\(.*\)')
-               shift
-               ;;
-
-       --au|--aut|--auth|--autho|--author)
-               case "$#" in 1) usage ;; esac
+       --author)
                shift
                quilt_author="$1"
-               shift
                ;;
-
-       --pa=*|--pat=*|--patc=*|--patch=*|--patche=*|--patches=*)
-               QUILT_PATCHES=$(expr "$1" : '-[^=]*\(.*\)')
-               shift
+       -n|--dry-run)
+               dry_run=1
                ;;
-
-       --pa|--pat|--patc|--patch|--patche|--patches)
-               case "$#" in 1) usage ;; esac
+       --patches)
                shift
                QUILT_PATCHES="$1"
-               shift
                ;;
-
+       --)
+               shift
+               break;;
        *)
-               break
+               usage
                ;;
        esac
+       shift
 done
 
 # Quilt Author
@@ -43,7 +42,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
@@ -53,33 +52,63 @@ if ! [ -d "$QUILT_PATCHES" ] ; then
        exit 1
 fi
 
-# Temporay directories
-tmp_dir=.dotest
+# Temporary directories
+tmp_dir="$GIT_DIR"/rebase-apply
 tmp_msg="$tmp_dir/msg"
 tmp_patch="$tmp_dir/patch"
 tmp_info="$tmp_dir/info"
 
 
 # Find the intial commit
-commit=$(git-rev-parse HEAD)
+commit=$(git rev-parse HEAD)
 
 mkdir $tmp_dir || exit 2
-for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do
+while read patch_name level garbage
+do
+       case "$patch_name" in ''|'#'*) continue;; esac
+       case "$level" in
+       -p*)    ;;
+       ''|'#'*)
+               level=;;
+       *)
+               echo "unable to parse patch level, ignoring it."
+               level=;;
+       esac
+       case "$garbage" in
+       ''|'#'*);;
+       *)
+               echo "trailing garbage found in series file: $garbage"
+               exit 1;;
+       esac
+       if ! [ -f "$QUILT_PATCHES/$patch_name" ] ; then
+               echo "$patch_name doesn't exist. Skipping."
+               continue
+       fi
        echo $patch_name
-       (cat $QUILT_PATCHES/$patch_name | git-mailinfo "$tmp_msg" "$tmp_patch" > "$tmp_info") || exit 3
+       git mailinfo "$tmp_msg" "$tmp_patch" \
+               <"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3
+       test -s "$tmp_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")
-       export GIT_AUTHOR_EMAIL=$(sed -ne 's/Email: //p' "$tmp_info")
+       GIT_AUTHOR_NAME=$(sed -ne 's/Author: //p' "$tmp_info")
+       GIT_AUTHOR_EMAIL=$(sed -ne 's/Email: //p' "$tmp_info")
+       export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
        while test -z "$GIT_AUTHOR_EMAIL" && test -z "$GIT_AUTHOR_NAME" ; do
                if [ -n "$quilt_author" ] ; then
                        GIT_AUTHOR_NAME="$quilt_author_name";
                        GIT_AUTHOR_EMAIL="$quilt_author_email";
+               elif [ -n "$dry_run" ]; then
+                       echo "No author found in $patch_name" >&2;
+                       GIT_AUTHOR_NAME="dry-run-not-found";
+                       GIT_AUTHOR_EMAIL="dry-run-not-found";
                else
-                       echo "No author found in $patch_name";
+                       echo "No author found in $patch_name" >&2;
                        echo "---"
                        cat $tmp_msg
-                       echo -n "Author: ";
+                       printf "Author: ";
                        read patch_author
 
                        echo "$patch_author"
@@ -92,15 +121,18 @@ for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do
                        GIT_AUTHOR_EMAIL="$patch_author_email"
                fi
        done
-       export GIT_AUTHOR_DATE=$(sed -ne 's/Date: //p' "$tmp_info")
-       export SUBJECT=$(sed -ne 's/Subject: //p' "$tmp_info")
+       GIT_AUTHOR_DATE=$(sed -ne 's/Date: //p' "$tmp_info")
+       SUBJECT=$(sed -ne 's/Subject: //p' "$tmp_info")
+       export GIT_AUTHOR_DATE SUBJECT
        if [ -z "$SUBJECT" ] ; then
                SUBJECT=$(echo $patch_name | sed -e 's/.patch$//')
        fi
 
-       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
-done
+       if [ -z "$dry_run" ] ; then
+               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
+       fi
+done <"$QUILT_PATCHES/series"
 rm -rf $tmp_dir || exit 5