summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-10-13 12:33:12 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-10-13 12:53:31 +0100
commitc4f072101fba40bf5d387dbdd98d1459df82c67d (patch)
tree906cc47746c753c25d56fc295431b9c57b0921ce
parent8b2b16dc65e5606cb8e4c286b7baa066c6ee53f0 (diff)
dgit: Combine option parsing of -wd and -wdd
We are going to introduce more variants, so we need to refactor this. No functionalk change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit6
1 files changed, 2 insertions, 4 deletions
diff --git a/dgit b/dgit
index de697a1..57e1e40 100755
--- a/dgit
+++ b/dgit
@@ -7262,12 +7262,10 @@ sub parseopts () {
} elsif (s/^-wgf$//s) {
push @ropts, $&;
$cleanmode = 'git-ff';
- } elsif (s/^-wd$//s) {
+ } elsif (s/^-wd(d?)$//s) {
push @ropts, $&;
$cleanmode = 'dpkg-source';
- } elsif (s/^-wdd$//s) {
- push @ropts, $&;
- $cleanmode = 'dpkg-source-d';
+ $cleanmode .= '-d' if $1;
} elsif (s/^-wc$//s) {
push @ropts, $&;
$cleanmode = 'check';