badcommit-fixup: Merge from a filtered view of my personal playground

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

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