From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Jun 2019 21:16:20 +0000 (+0100)
Subject: dgit: baredebian: Honour baredebian+git alias for baredebian
X-Git-Tag: archive/debian/9.0~17
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d61c3b4c98cdcb527bb598946950e66b4487ea51

dgit: baredebian: Honour baredebian+git alias for baredebian

We convert this to `baredebian' internally, and that is what will
appear in messages.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 84fcc3f2..2d235a63 100755
--- a/dgit
+++ b/dgit
@@ -82,7 +82,7 @@ our $quilt_mode;
 our $quilt_upstream_commitish;
 our $quilt_upstream_commitish_used;
 our $quilt_upstream_commitish_message;
-our $quilt_options_re = 'gbp|dpm|baredebian(?:\+tarball)?';
+our $quilt_options_re = 'gbp|dpm|baredebian(?:\+tarball|\+git)?';
 our $quilt_modes_re = "linear|smash|auto|nofix|nocheck|unapplied|$quilt_options_re";
 our $splitview_mode;
 our $splitview_modes_re = qr{auto|always|never};
@@ -7716,6 +7716,7 @@ sub parseopts_late_defaults () {
 	    or badcfg f_ "unknown quilt-mode \`%s'", $quilt_mode;
 	$quilt_mode = $1;
     }
+    $quilt_mode =~ s/^(baredebian)\+git$/$1/;
 
     foreach my $moc (@modeopt_cfgs) {
 	local $access_forpush;