Detect and reject git trees containing debian/source/local-options.

diff --git a/debian/changelog b/debian/changelog
index e8c0e61a7b6bfbe1e6731620adc95730c53105be..604d66d42350ef0dab130dc1ad781e7b33a61292 100644 (file)
--- 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.
     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 7c76a6f5473f6fc97b3fa1b0e1de902c9653faa6..621288b7184186f6c95607cb4727af83e9b742bd 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1761,6 +1761,10 @@ sub check_not_dirty () {
     } else {
        failedcmd @cmd;
     }
     } else {
        failedcmd @cmd;
     }

+
+    if (stat_exists "debian/source/local-options") {
+       fail "git tree contains debian/source/local-options";
+    }

 }
 
 sub commit_admin ($) {
 }
 
 sub commit_admin ($) {