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 b525dad8e4cc068a42310b03446ebe2a61b7be08..b58479c727ddccbeff63f9fc8d170005d3149d0e 100644 (file)
--- 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 48a42d93ea132e96d41353da10240286d2443d54..cff5d06cd33d80107a281dad33135db87e81e99d 100755 (executable)
--- 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 $!;
     }