summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xdgit10
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 797db8a..f830aba 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 940c89b..b3a4e9b 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 ($) {