X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=infra%2Fdgit-repos-policy-debian;h=e85e92c5ebf4531ccc20229c2f4004ba6a49b598;hp=ee369b06a8210a864a5127f9eaa8368b4d8b3fa5;hb=f30bb13a7fdac4f59a4a814462d869196a424d01;hpb=c7821c26c30b0a79658b626ee7f2a17f73cdc952

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index ee369b06..e85e92c5 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -18,6 +18,7 @@
 
 use strict;
 
+use Debian::Dgit::Infra; # must precede Debian::Dgit; - can change @INC!
 use Debian::Dgit qw(:DEFAULT :policyflags);
 setup_sigwarn();
 
@@ -132,7 +133,7 @@ sub vsn_in_our_history ($) {
 
     my @tagrefs = map { "refs/tags/".$_ } debiantags $vsn, $distro;
     printdebug " checking history  vsn=$vsn tagrefs=@tagrefs\n";
-    open F, "-|", qw(git-for-each-ref), @tagrefs;
+    open F, "-|", qw(git for-each-ref), @tagrefs;
     $_ = <F>;
     close F;
     return 1 if defined && m/\S/;
@@ -261,6 +262,21 @@ sub check_package () {
     if (good_suite_has_suitable_vsn(\&vsn_in_our_history)) {
 	chmod $publicmode, "." or die $!;
 	$pkg_secret = 0;
+	eval {
+	    my $mirror_hook = "$distrodir/mirror-hook";
+	    if (stat_exists $mirror_hook) {
+		my @mirror_cmd =
+		    ($mirror_hook, $distrodir, "updated-hook", $pkg);
+		debugcmd " (mirror)",@mirror_cmd;
+		system @mirror_cmd and failedcmd @mirror_cmd;
+	    }
+	};
+	if (length $@) {
+	    chomp $@;
+	    print STDERR "policy hook: warning:".
+		" failed to mirror publication of \`$pkg':".
+		" $@\n";
+	}
 	return 0;
     }
 
@@ -318,10 +334,19 @@ sub action_push () {
     if (deliberately('include-questionable-history')) {
 	return 0;
     }
-    die "\nPackage is in NEW and has not been accepted or rejected yet;".
-	" use a --deliberately option to specify whether you are".
-	" keeping or discarding the previously pushed history. ".
-	" Please RTFM dgit(1).\n\n";
+    die <<END;
+
+Package is in NEW and has not been accepted or rejected yet.
+Unfortunately, we cannot determine automatically what should happen.
+You will have to pass either --deliberately-not-fast-forward or
+--deliberately-include-questionable-history to specify whether you are
+keeping or discarding the previously pushed history.
+
+The choice is important, to ensure that your git history is both
+suitable for public distribution and as useful as possible.  Please
+see the descriptions of these options in dgit(1).
+
+END
 }
 
 sub action_push_confirm () {
@@ -354,6 +379,10 @@ END
     my $checkpid = open CHKOUT, "-|" // die $!;
     if (!$checkpid) {
 	open STDIN, "<&", $chkinput or die $!;
+	delete $ENV{GIT_ALTERNATE_OBJECT_DIRECTORIES};
+	# ^ recent versions of git set this in the environment of
+	# receive hooks.  This can cause us to see things which
+	# the user is trying to abolish.
 	exec @objscatcmd or die $!;
     }