X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=infra%2Fdgit-repos-policy-debian;h=cff5d06cd33d80107a281dad33135db87e81e99d;hb=71437159c44af0328fc4bbc1826be18e4f057444;hp=e37690c0b495791cdc2adac29cc6b3e87dc950ce;hpb=8a178bf100d49ad948f5f3ec5540da1ff9c74c3e;p=dgit.git

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index e37690c0..cff5d06c 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -1,8 +1,24 @@
 #!/usr/bin/perl -w
 # dgit repos policy hook script for Debian
+#
+# Copyright (C) 2015-2016  Ian Jackson
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use strict;
 
+use Debian::Dgit::Infra; # must precede Debian::Dgit; - can change @INC!
 use Debian::Dgit qw(:DEFAULT :policyflags);
 setup_sigwarn();
 
@@ -117,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/;
@@ -339,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 $!;
     }