Do check_repository_format() early (re-fix)

[git.git] / git-quiltimport.sh

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index edccd827553d04dde89f210bbb5128ccc09eff3d..880c81d121bfb9555c729bc299f8ae8baf1db32c 100755 (executable)
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -5,7 +5,7 @@ SUBDIRECTORY_ON=Yes
 
 dry_run=""
 quilt_author=""
-while case "$#" in 0) break;; esac
+while test $# != 0
 do
        case "$1" in
        --au=*|--aut=*|--auth=*|--autho=*|--author=*)
@@ -67,15 +67,20 @@ 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
+for patch_name in $(grep -v '^#' < "$QUILT_PATCHES/series" ); do
+       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
-       test -s $dotest/patch || {
-               echo "Patch is empty.  Was is split wrong?"
-               stop_here $this
+       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
@@ -113,10 +118,10 @@ for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do
        fi
 
        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 -m "quiltimport: $patch_name" HEAD $commit || exit 4
+               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 -m "quiltimport: $patch_name" HEAD $commit || exit 4
        fi
 done
 rm -rf $tmp_dir || exit 5