From: Sean Whitton Date: Sun, 7 Jul 2019 06:14:35 +0000 (+0100) Subject: git-debpush: Don't pretend to support --baredebian+tarball X-Git-Tag: archive/debian/9.1~5 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f243150f78a1a9556ac47c96208087410091349e;p=dgit.git 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 --- diff --git a/git-debpush b/git-debpush index ae5f20f0..63057ed2 100755 --- a/git-debpush +++ b/git-debpush @@ -95,7 +95,8 @@ while true; do '--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" ;; @@ -107,8 +108,9 @@ if [ $# != 0 ]; then 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+tarball) fail "--baredebian+tarball quilt mode not supported" ;; *) badusage "invalid quilt mode: $quilt_mode" ;; esac diff --git a/git-debpush.1.pod b/git-debpush.1.pod index cba27482..2ce7013a 100644 --- 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. -=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