Dgit.pm: When checking that the tree is clean, check the git index too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 7da60f664cb079438213fa95f70a7a899ab99d98..3657aa130acee7d88cfe8f0c17da2694acb8cc74 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -445,14 +445,21 @@ sub git_for_each_tag_referring ($$) {
 }
 
 sub git_check_unmodified () {
-    my @cmd = qw(git diff --quiet HEAD);
-    debugcmd "+",@cmd;
-    $!=0; $?=-1; system @cmd;
-    return if !$?;
-    if ($?==256) {
-       fail "working tree is dirty (does not match HEAD)";
-    } else {
-       failedcmd @cmd;
+    foreach my $cached (qw(0 1)) {
+       my @cmd = qw(git diff --quiet);
+       push @cmd, qw(--cached) if $cached;
+       push @cmd, qw(HEAD);
+       debugcmd "+",@cmd;
+       $!=0; $?=-1; system @cmd;
+       return if !$?;
+       if ($?==256) {
+           fail
+               $cached
+               ? "git index contains changes (does not match HEAD)"
+               : "working tree is dirty (does not match HEAD)";
+       } else {
+           failedcmd @cmd;
+       }
     }
 }
 

diff --git a/debian/changelog b/debian/changelog
index e41345408507813ac30bf8a403251a9adccaa154..91dd7c494c8913322ba647f3da12698428d7a279 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 dgit (4.5~) unstable; urgency=medium
 
+  Bugfixes:
+  * When checking that the tree is clean, check the git index too.
+
   Minor fixes:
   * "confess" when we die due to a warning, rather than symply dieing.