From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 29 Jun 2019 15:04:05 +0000 (+0100)
Subject: dgit: Break out $quilt_options_re
X-Git-Tag: archive/debian/9.0~51
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=903d70baa9fa0cc130145f2a0eddf0f9077048cc

dgit: Break out $quilt_options_re

No functional change.

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

diff --git a/dgit b/dgit
index ac68c657..437e18b1 100755
--- a/dgit
+++ b/dgit
@@ -82,7 +82,8 @@ our $quilt_mode;
 our $quilt_upstream_commitish;
 our $quilt_upstream_commitish_used;
 our $quilt_upstream_commitish_message;
-our $quilt_modes_re = 'linear|smash|auto|nofix|nocheck|gbp|dpm|unapplied|baredebian';
+our $quilt_options_re = 'gbp|dpm|baredebian';
+our $quilt_modes_re = "linear|smash|auto|nofix|nocheck|unapplied|$quilt_options_re";
 our $splitview_mode;
 our $splitview_modes_re = qr{auto|always|never};
 our $dodep14tag;
@@ -7393,7 +7394,7 @@ sub parseopts () {
 		push @ropts, $_;
 		my $cmd = shift @$om;
 		@$om = ($cmd, grep { $_ ne $2 } @$om);
-	    } elsif (m/^--(gbp|dpm|baredebian)$/s) {
+	    } elsif (m/^--($quilt_options_re)$/s) {
 		push @ropts, "--quilt=$1";
 		$quilt_mode = $1;
 	    } elsif (m/^--(?:ignore|include)-dirty$/s) {