Reject debian/source/local-patch-header

diff --git a/debian/changelog b/debian/changelog
index d362977aab9bd35e6f61b87cc508a77d57612620..1097b7793c636582966ad57c6c3255d638392dd4 100644 (file)
--- 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 f4e2abfb4c9998c5002fa6bd729cbd0ba7a377e3..a49c7667e611c577e70cd48f75ff122e277a62be 100755 (executable)
--- 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";
+       }
     }
 }