From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 19 Dec 2016 16:01:47 +0000 (+0000)
Subject: dgit-repos-policy-debian; Unset GIT_ALTERNATE_OBJECT_DIRECTORIES
X-Git-Tag: archive/debian/2.12~21
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f60ec72817bf5cc38a8ec83abd2e065f0433001c;hp=0c130d5e2e33cd8bed0ba0318c62591dabfc3467

dgit-repos-policy-debian; Unset GIT_ALTERNATE_OBJECT_DIRECTORIES

This broke due to recent git setting GIT_ALTERNATE_OBJECT_DIRECTORIES
in the pre-receive-hook.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index b525dad8..b58479c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (2.12~) unstable; urgency=medium
 
-  * 
+  * Fix dgit-repos-policy-debian which broke due to recent git setting
+    GIT_ALTERNATE_OBJECT_DIRECTORIES in the pre-receive-hook.
 
  --
 
diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 48a42d93..cff5d06c 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -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 $!;
     }