diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-30 22:16:20 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-30 22:16:20 +0100 |
commit | d61c3b4c98cdcb527bb598946950e66b4487ea51 (patch) | |
tree | 0bf49734f228559c41d68eefa347d9b6ba883e20 | |
parent | ff2f54585ff5ab8449af347b89d4ee1ba12a70cc (diff) |
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>
-rwxr-xr-x | dgit | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; |