From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 22 Aug 2013 13:52:47 +0000 (+0100)
Subject: better error msgs from check_not_dirty
X-Git-Tag: debian/0.4_pre1~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f8ad84e8235e1741857849e46bcc70c2f5bc3790

better error msgs from check_not_dirty
---

diff --git a/debian/changelog b/debian/changelog
index 797db8a4..f830abad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dgit (0.4~~iwj) experimental; urgency=low
+dgit (0.4~pre1) experimental; urgency=low
 
   * Use dgit.debian.net vhost on alioth.  Closes #720172.
   * Usage message.  Closes #720085.
diff --git a/dgit b/dgit
index 940c89b5..b3a4e9b7 100755
--- a/dgit
+++ b/dgit
@@ -707,7 +707,15 @@ sub pull () {
 }
 
 sub check_not_dirty () {
-    runcmd @git, qw(diff --quiet HEAD);
+    my @cmd = (@git, qw(diff --quiet HEAD));
+    printcmd(\*DEBUG,"+",@cmd) if $debug>0;
+    $!=0; $?=0; system @cmd;
+    return if !$! && !$?;
+    if (!$! && $?==256) {
+	fail "working tree is dirty (does not match HEAD)";
+    } else {
+	failedcmd @cmd;
+    }
 }
 
 sub commit_quilty_patch ($) {