git-debpush: Don't pretend to support --baredebian+tarball

Instead of just deleting the option from the argument parser, accept
it, but print a message explicitly stating that the *quilt mode* is
not supported by this workflow (i.e. it's not just git-debpush passing
the quilt mode on to tag2upload that we don't support).

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

diff --git a/git-debpush b/git-debpush
index ae5f20f0ea967535d0cdb04a9f6619636b829391..63057ed24ee3334c3cfc4dd0d5d35bcc3cdec1ef 100755 (executable)
--- a/git-debpush
+++ b/git-debpush
@@ -95,7 +95,8 @@ while true; do
         '--baredebian'|'--baredebian+git')
             quilt_mode=baredebian;         shift; continue ;;
         '--baredebian+tarball')
         '--baredebian'|'--baredebian+git')
             quilt_mode=baredebian;         shift; continue ;;
         '--baredebian+tarball')

-            quilt_mode=baredebian+tarball; shift; continue ;;
+            fail "--baredebian+tarball quilt mode not supported"
+            ;;

 
         '--') shift; break ;;
        *) badusage "unknown option $1" ;;
 
         '--') shift; break ;;
        *) badusage "unknown option $1" ;;


@@ -107,8 +108,9 @@ if [ $# != 0 ]; then
 fi
 
 case "$quilt_mode" in
 fi
 
 case "$quilt_mode" in

-    linear|auto|smash|nofix|gbp|dpm|unapplied|baredebian|baredebian+tarball|'') ;;
+    linear|auto|smash|nofix|gbp|dpm|unapplied|baredebian|'') ;;

     baredebian+git) quilt_mode="baredebian" ;;
     baredebian+git) quilt_mode="baredebian" ;;

+    baredebian+tarball) fail "--baredebian+tarball quilt mode not supported" ;;

     *) badusage "invalid quilt mode: $quilt_mode" ;;
 esac
 
     *) badusage "invalid quilt mode: $quilt_mode" ;;
 esac
 

diff --git a/git-debpush.1.pod b/git-debpush.1.pod
index cba27482a1a48ea39867c9d6ce5d9cb6876b6277..2ce7013a511cb541d60a5e5a91331c81138051a0 100644 (file)
--- a/git-debpush.1.pod
+++ b/git-debpush.1.pod
@@ -109,11 +109,6 @@ You are using git-dpm(1)'s branch format.
 You are using the 'bare debian' branch format, with the upstream
 source in the form of an upstream tag.
 
 You are using the 'bare debian' branch format, with the upstream
 source in the form of an upstream tag.
 

-=item B<--quilt=baredebian+tarball>|B<--baredebian+tarball>
-
-You are using the 'bare debian' branch format, with the upstream
-source in the form of a tarball.
-

 =item B<--quilt=linear>
 
 You are using the 'manually maintained applied' branch format or
 =item B<--quilt=linear>
 
 You are using the 'manually maintained applied' branch format or