X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Debian%2FDgit.pm;h=d5834176686b80ff6c9c6541d0fbdfdb39ea50af;hb=6d23729c4dd314393f3e9596d4dcdd106cee4a11;hp=7da60f664cb079438213fa95f70a7a899ab99d98;hpb=f90d29c48dd4183174dd08f36d03e9db81636eb0;p=dgit.git

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 7da60f66..d5834176 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -55,7 +55,9 @@ BEGIN {
                       $package_re $component_re $deliberately_re
 		      $distro_re $versiontag_re $series_filename_re
 		      $extra_orig_namepart_re
+		      $git_null_obj
                       $branchprefix
+		      $ffq_refprefix $gdrlast_refprefix
                       initdebug enabledebug enabledebuglevel
                       printdebug debugcmd
                       $debugprefix *debuglevel *DEBUG
@@ -83,6 +85,9 @@ our $versiontag_re = qr{[-+.\%_0-9a-zA-Z/]+};
 our $branchprefix = 'dgit';
 our $series_filename_re = qr{(?:^|\.)series(?!\n)$}s;
 our $extra_orig_namepart_re = qr{[-0-9a-z]+};
+our $git_null_obj = '0' x 40;
+our $ffq_refprefix = 'ffq-prev';
+our $gdrlast_refprefix = 'debrebase-last';
 
 # policy hook exit status bits
 # see dgit-repos-server head comment for documentation
@@ -445,14 +450,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;
+	}
     }
 }