From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 21 Aug 2015 15:39:17 +0000 (+0100)
Subject: Reject debian/source/local-patch-header
X-Git-Tag: debian/1.4~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f18eae634f175b488386abca5cf80237e4418fce

Reject debian/source/local-patch-header
---

diff --git a/debian/changelog b/debian/changelog
index d362977a..1097b779 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ dgit (1.4~~) UNRELEASED; urgency=low
     the error message.  (This has been broken forever.)
   * In dgit(7), discuss binaries and documentation present in upstream but
     removed by rules clean.
-  * Detect and reject git trees containing debian/source/local-options.
+  * Detect and reject git trees containing debian/source/local-options
+    or debian/source/local-patch-header.
   * In --dry-run mode, _do_ actually run dpkg-source --commit so that we
     actually do construct the quilt fixup commit; instead, honour
     --dry-run by avoiding pulling it back to your HEAD.
diff --git a/dgit b/dgit
index f4e2abfb..a49c7667 100755
--- a/dgit
+++ b/dgit
@@ -1762,8 +1762,10 @@ sub check_not_dirty () {
 	failedcmd @cmd;
     }
 
-    if (stat_exists "debian/source/local-options") {
-	fail "git tree contains debian/source/local-options";
+    foreach my $f (qw(local-options local-patch-header)) {
+	if (stat_exists "debian/source/$f") {
+	    fail "git tree contains debian/source/$f";
+	}
     }
 }