From 6111c7d2bd46c48d2b6b7d5b9695f7d349c81c5f Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 19 Aug 2015 16:35:51 +0100
Subject: Detect and reject git trees containing debian/source/local-options.

---
 debian/changelog | 1 +
 dgit             | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e8c0e61..604d66d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ 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.
 
  --
 
diff --git a/dgit b/dgit
index 7c76a6f..621288b 100755
--- a/dgit
+++ b/dgit
@@ -1761,6 +1761,10 @@ sub check_not_dirty () {
     } else {
 	failedcmd @cmd;
     }
+
+    if (stat_exists "debian/source/local-options") {
+	fail "git tree contains debian/source/local-options";
+    }
 }
 
 sub commit_admin ($) {
-- 
cgit v1.2.3