summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-29 16:04:05 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-30 21:11:17 +0100
commit903d70baa9fa0cc130145f2a0eddf0f9077048cc (patch)
tree6df550b7c86cf94480df8e172991671102d50680 /dgit
parent173b552549446518c223d805ee610656d79fa1ea (diff)
dgit: Break out $quilt_options_re
No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit5
1 files changed, 3 insertions, 2 deletions
diff --git a/dgit b/dgit
index ac68c65..437e18b 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) {