dgit-badcommit-fixup: Ship

[dgit.git] / infra / dgit-repos-policy-debian

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index ee369b06a8210a864a5127f9eaa8368b4d8b3fa5..cff5d06cd33d80107a281dad33135db87e81e99d 100755 (executable)
--- 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/;
@@ -354,6 +355,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 $!;
     }