From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 13 Oct 2018 10:17:55 +0000 (+0100)
Subject: dgit: Use a regexp to match clean mode check
X-Git-Tag: archive/debian/8.0~27
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=inline;h=3e3eff12e8f475d4b8bf296d518c786d8a810e29;p=dgit.git

dgit: Use a regexp to match clean mode check

This will make it easier to introduce new variants.

No functional change.

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

diff --git a/dgit b/dgit
index 7f58bc51..2d7b8d4a 100755
--- a/dgit
+++ b/dgit
@@ -6201,7 +6201,7 @@ sub maybe_unapply_patches_again () {
 
 sub clean_tree_check () {
     # Not yet fully implemented.
-    if ($cleanmode eq 'check') {
+    if ($cleanmode =~ m{^check}) {
 	my $leftovers = cmdoutput @git, qw(clean -xdn);
 	if (length $leftovers) {
 	    print STDERR $leftovers, "\n" or confess $!;
@@ -6224,7 +6224,7 @@ sub clean_tree () {
 	runcmd_ordryrun_local @git, qw(clean -xdf);
     } elsif ($cleanmode eq 'git-ff') {
 	runcmd_ordryrun_local @git, qw(clean -xdff);
-    } elsif ($cleanmode eq 'check') {
+    } elsif ($cleanmode =~ m{^check}) {
 	clean_tree_check();
     } elsif ($cleanmode eq 'none') {
     } else {