X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=infra%2Fdgit-repos-server;h=55dc81fff1d16b09ca61413df3927574a0658f86;hb=643fe03fd85c430ca77c9a3a59a4d9e6f99e9f7c;hp=eb4b377334d017807e7f22d70a22946be0707b9e;hpb=f773b1ed2796196e0fa801886fce493544c38fe0;p=dgit.git

diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index eb4b3773..55dc81ff 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -163,6 +163,7 @@ setup_sigwarn();
 #    NOCOMMITCHECK   (8)
 #         suppress dgit-repos-server's check that commits do
 #         not lack "committer" info (eg as produced by #849041)
+#         ("push" only)
 # any unexpected bits mean failure, and then known set bits are ignored
 # if no unexpected bits set, operation continues (subject to meaning
 # of any expected bits set).  So, eg, exit 0 means "continue normally"
@@ -406,16 +407,21 @@ sub makeworkingclone () {
     rmtree "${workrepo}_fresh";
 }
 
+sub mkscript ($$) {
+    my ($path,$contents) = @_;
+    my $fh = new IO::File $path, O_WRONLY|O_CREAT|O_TRUNC, 0777
+	or die "$path: $!";
+    print $fh $contents or die "$path: $!";
+    close $fh or die "$path: $!";
+}
+
 sub setupstunthook () {
     my $prerecv = "$workrepo/hooks/pre-receive";
-    my $fh = new IO::File $prerecv, O_WRONLY|O_CREAT|O_TRUNC, 0777
-	or die "$prerecv: $!";
-    print $fh <<END or die "$prerecv: $!";
+    mkscript $prerecv, <<END;
 #!/bin/sh
 set -e
 exec $0 --pre-receive-hook $package
 END
-    close $fh or die "$prerecv: $!";
     $ENV{'DGIT_DRS_WORK'}= $workrepo;
     $ENV{'DGIT_DRS_DEST'}= $destrepo;
     printdebug " stunt hook set up $prerecv\n";
@@ -873,7 +879,7 @@ sub checks () {
 
     @policy_args = ($package,$version,$suite,$tagname,
 		    join(",",@deliberatelies));
-    $policy = policyhook(NOFFCHECK|FRESHREPO, 'push', @policy_args);
+    $policy = policyhook(NOFFCHECK|FRESHREPO|NOCOMMITCHECK, 'push', @policy_args);
 
     if (defined $tagexists_error) {
 	if ($policy & FRESHREPO) {
@@ -896,8 +902,8 @@ sub checks () {
 
     # defend against commits generated by #849041
     if (!($policy & NOCOMMITCHECK)) {
-	my @checks = qw(%an %ae %at
-			%cn %ce %ct);
+	my @checks = qw(%ae %at
+			%ce %ct);
 	my @chk = qw(git log -z);
 	push @chk, '--pretty=tformat:%H%n'.
 	    (join "", map { $_, '%n' } @checks);
@@ -937,6 +943,17 @@ sub onwardpush () {
     my @cmdbase = (qw(git send-pack), $destrepo);
     push @cmdbase, qw(--force) if $policy & NOFFCHECK;
 
+    if ($ENV{GIT_QUARANTINE_PATH}) {
+	my $recv_wrapper = "$ENV{GIT_QUARANTINE_PATH}/dgit-recv-wrapper";
+	mkscript $recv_wrapper, <<'END';
+#!/bin/sh
+set -e
+unset GIT_QUARANTINE_PATH
+exec git receive-pack "$@"
+END
+	push @cmdbase, "--receive-pack=$recv_wrapper";
+    }
+
     my @cmd = @cmdbase;
     push @cmd, "$commit:refs/dgit/$suite",
 	       "$tagval:refs/tags/$tagname";