From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 11 Oct 2018 00:30:55 +0000 (+0100)
Subject: dgit: Factor out debian/source/.. in check_not_dirty
X-Git-Tag: archive/debian/8.0~38
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=86b1bd2035ce1da863c682223893b59ed74962f9;p=dgit.git

dgit: Factor out debian/source/.. in check_not_dirty

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

diff --git a/dgit b/dgit
index 5754e456..8df8f761 100755
--- a/dgit
+++ b/dgit
@@ -3818,9 +3818,10 @@ sub pull () {
 
 sub check_not_dirty () {
     my @forbid = qw(local-options local-patch-header);
+    @forbid = map { "debian/source/$_" } @forbid;
     foreach my $f (@forbid) {
-	if (stat_exists "debian/source/$f") {
-	    fail f_ "git tree contains debian/source/%s", $f;
+	if (stat_exists $f) {
+	    fail f_ "git tree contains %s", $f;
 	}
     }