chiark / gitweb /
Merge remote-tracking branch 'spwhitton/maint-merge-updates' into fix
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 19 Dec 2016 16:57:16 +0000 (16:57 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 19 Dec 2016 16:57:16 +0000 (16:57 +0000)
debian/changelog
infra/dgit-repos-policy-debian
tests/lib
tests/tests/gbp-orig
tests/tstunt/debuild [new file with mode: 0755]
tests/tstunt/lintian [new file with mode: 0755]

index 907509005e5f8be9c6432273f206e34ec63299e0..f6d9272df1a8b05cbb538e177572cd10213a5347 100644 (file)
@@ -1,3 +1,14 @@
+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.
+
+  Test suite:
+  * Provide and use stunt lintian and debuild, to avoid lintian
+    complaining about our stupid test packages.
+
+ --
+
 dgit (2.11) unstable; urgency=medium
 
   Documentation:
index 48a42d93ea132e96d41353da10240286d2443d54..cff5d06cd33d80107a281dad33135db87e81e99d 100755 (executable)
@@ -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 $!;
     }
 
index b033dde2f78040b5a55ea06dd781d8fb1db5a772..d075bc763f0d05249b233294d64dd91bc6b7c0f7 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -759,6 +759,16 @@ t-tstunt-parsechangelog () {
        t-tstunt dpkg-parsechangelog Dpkg/Changelog/Parse.pm
 }
 
+t-tstunt-lintian () {
+       t-tstunt lintian
+}
+
+t-tstunt-debuild () {
+       : ${DGIT_TEST_REAL_DEBUILD:=$(type -p debuild)}
+       export DGIT_TEST_REAL_DEBUILD
+       t-tstunt debuild
+}
+
 t-incoming-dsc () {
        local dsc=${p}_${v}.dsc
        incoming_dsc=$tmp/incoming/$dsc
index ffc145f3df2184178330047035b902155712c164..29dd4570848b7234efdb7619e8771e2e99da0321 100755 (executable)
@@ -3,6 +3,8 @@ set -e
 . tests/lib
 
 t-tstunt-parsechangelog
+t-tstunt-debuild
+t-tstunt-lintian
 
 t-archive-none example
 t-git-none
diff --git a/tests/tstunt/debuild b/tests/tstunt/debuild
new file mode 100755 (executable)
index 0000000..2b2ca71
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+echo "DGIT TEST STUNT DEBUILD $*" >&2
+"${DGIT_TEST_REAL_DEBUILD}" --preserve-env --preserve-envvar PATH "$@"
diff --git a/tests/tstunt/lintian b/tests/tstunt/lintian
new file mode 100755 (executable)
index 0000000..f7c2985
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo >&2 'W: dgit test suite stunt lintian detects no problems'
+exit 0