From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Aug 2013 15:54:16 +0000 (+0100)
Subject: improve dirty checks
X-Git-Tag: debian/0.3~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=204dfaf210b11dd980970166ef7fc2c2456d245c;ds=sidebyside

improve dirty checks
---

diff --git a/dgit b/dgit
index f65b51a7..da4e57c3 100755
--- a/dgit
+++ b/dgit
@@ -551,6 +551,18 @@ sub pull () {
     printdone "fetched to ".lrref()." and merged into HEAD";
 }
 
+sub check_not_dirty () {
+    my $output = cmdoutput @git, qw(status --porcelain);
+    if (length $output) {
+	my $m = "tree dirty:\n$output\n";
+	if (!$dryrun) {
+	    die $m;
+	} else {
+	    warn $m;
+	}
+    }
+}
+
 sub dopush () {
     runcmd @git, qw(diff --quiet HEAD);
     my $clogp = parsechangelog();
@@ -558,6 +570,7 @@ sub dopush () {
     my $dscfn = "${package}_$clogp->{Version}.dsc";
     stat "../$dscfn" or die "$dscfn $!";
     $dsc = parsecontrol("../$dscfn");
+    check_not_dirty();
     prep_ud();
     chdir $ud or die $!;
     print "checking that $dscfn corresponds to HEAD\n";
@@ -671,6 +684,7 @@ sub cmd_pull {
 sub cmd_push {
     parseopts();
     die if defined $package;
+    runcmd @git, qw(diff --quiet HEAD);
     my $clogp = parsechangelog();
     $package = $clogp->{Source};
     if (@ARGV==0) {