From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 6 Jan 2019 11:15:13 +0000 (+0000)
Subject: dgit: clean: Change matcbing of git to regexps
X-Git-Tag: archive/debian/8.3~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=70b522e712e52444e8c7b924502380d6413040fa;hp=e0c2627975ac581b23826ec9a3e766df5dfea46c

dgit: clean: Change matcbing of git to regexps

We are going to have some ,... suffixes on this, so we need more
general matching.

No functional change with the current set of clean modes.

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

diff --git a/dgit b/dgit
index 1090984a..37d38618 100755
--- a/dgit
+++ b/dgit
@@ -6269,9 +6269,9 @@ sub clean_tree () {
 	runcmd_ordryrun_local @cmd;
 	clean_tree_check_git_wd __
  "tree contains uncommitted files (after running rules clean)";
-    } elsif ($cleanmode eq 'git') {
+    } elsif ($cleanmode =~ m{^git(?!-)}) {
 	runcmd_ordryrun_local @git, qw(clean -xdf);
-    } elsif ($cleanmode eq 'git-ff') {
+    } elsif ($cleanmode =~ m{^git-ff}) {
 	runcmd_ordryrun_local @git, qw(clean -xdff);
     } elsif ($cleanmode =~ m{^check}) {
 	clean_tree_check();