Merge branch 'tt/help'

[git.git] / git-quiltimport.sh

diff --git a/git-quiltimport.sh b/git-quiltimport.sh
index 9de54d19fbc96c18ad52b1fe6b1126432d40f17a..6b0c4d2f279cf9e567e8c317c21e59d352ce3ff6 100755 (executable)
--- a/git-quiltimport.sh
+++ b/git-quiltimport.sh
@@ -1,46 +1,39 @@
 #!/bin/sh
-USAGE='--dry-run --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 "z$1" : 'z-[^=]*\(.*\)')
-               shift
-               ;;
-
-       --au|--aut|--auth|--autho|--author)
-               case "$#" in 1) usage ;; esac
+       --author)
                shift
                quilt_author="$1"
-               shift
                ;;
-
-       --dry-run)
-               shift
+       -n|--dry-run)
                dry_run=1
                ;;
-
-       --pa=*|--pat=*|--patc=*|--patch=*|--patche=*|--patches=*)
-               QUILT_PATCHES=$(expr "z$1" : 'z-[^=]*\(.*\)')
-               shift
-               ;;
-
-       --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
@@ -71,6 +64,10 @@ commit=$(git rev-parse HEAD)
 
 mkdir $tmp_dir || exit 2
 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
        git mailinfo "$tmp_msg" "$tmp_patch" \
                <"$QUILT_PATCHES/$patch_name" >"$tmp_info" || exit 3