summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-07-07 07:14:35 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-07 11:18:18 +0100
commitf243150f78a1a9556ac47c96208087410091349e (patch)
treeec089e67ebf72b32834ee79973f1a28db979c2ef
parent82a5c66c1525e7d337f9ff6d2fb292895e8b9a36 (diff)
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>
-rwxr-xr-xgit-debpush6
-rw-r--r--git-debpush.1.pod5
2 files changed, 4 insertions, 7 deletions
diff --git a/git-debpush b/git-debpush
index ae5f20f..63057ed 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 cba2748..2ce7013 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