X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Debian%2FDgit.pm;h=3657aa130acee7d88cfe8f0c17da2694acb8cc74;hb=d371437104d5a7a4ec623a2e0be716063c7dde92;hp=d086cbe50d36d33e14cea82de5f00b8b367d569a;hpb=012a80b3779e6241c270b73771f1d5019c1ca196;p=dgit.git

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index d086cbe5..3657aa13 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -51,8 +51,10 @@ BEGIN {
                       git_rev_parse git_cat_file
 		      git_get_ref git_get_symref git_for_each_ref
                       git_for_each_tag_referring is_fast_fwd
+		      git_check_unmodified
                       $package_re $component_re $deliberately_re
 		      $distro_re $versiontag_re $series_filename_re
+		      $extra_orig_namepart_re
                       $branchprefix
                       initdebug enabledebug enabledebuglevel
                       printdebug debugcmd
@@ -80,6 +82,7 @@ our $distro_re = $component_re;
 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]+};
 
 # policy hook exit status bits
 # see dgit-repos-server head comment for documentation
@@ -441,6 +444,25 @@ sub git_for_each_tag_referring ($$) {
     });
 }
 
+sub git_check_unmodified () {
+    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;
+	}
+    }
+}
+
 sub is_fast_fwd ($$) {
     my ($ancestor,$child) = @_;
     my @cmd = (qw(git merge-base), $ancestor, $child);