X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=621288b7184186f6c95607cb4727af83e9b742bd;hb=6111c7d2bd46c48d2b6b7d5b9695f7d349c81c5f;hp=916177c3cd0ed895c727abfe9dc585c6950dfe3e;hpb=3d241c37fc1139f8942299323d72fc2e493f036c;p=dgit.git

diff --git a/dgit b/dgit
index 916177c3..621288b7 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 ($) {
@@ -2627,7 +2631,7 @@ sub quiltify ($$) {
 	my $abbrev = sub {
 	    my $x = $_[0]{Commit};
 	    $x =~ s/(.*?[0-9a-z]{8})[0-9a-z]*$/$1/;
-	    return $;
+	    return $x;
 	};
 	my $reportnot = sub {
 	    my ($notp) = @_;