From b19d59fb104f8f260a139c838fc08a0158431415 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 12 Feb 2014 18:25:31 +0000
Subject: [PATCH] dgit-repos-server: fixes, tests.  can now pass
 drs-clone-nogit, really

---
 dgit-repos-server | 9 ++++++++-
 tests/lib         | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/dgit-repos-server b/dgit-repos-server
index 57cb5be1..ad4cde56 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -451,6 +451,14 @@ sub checksuite () {
     reject "unknown suite";
 }
 
+sub tagh1 ($) {
+    my ($tag) = @_;
+    my $vals = $tagh{$tag};
+    reject "missing tag $tag in signed tag object" unless $vals;
+    reject "multiple tags $tag in signed tag object" unless @$vals == 1;
+    return $vals->[0];
+}
+
 sub checks () {
     debug "checks";
     checksuite();
@@ -485,7 +493,6 @@ sub onwardpush () {
 
 sub stunthook () {
     debug "stunthook";
-    print Dumper(\$ENV{GIT_DIR});
     chdir $workrepo or die "chdir $workrepo: $!";
     mkdir "dgit-tmp" or $!==EEXIST or die $!;
     readupdates();
diff --git a/tests/lib b/tests/lib
index 7c82081a..0630f1d1 100644
--- a/tests/lib
+++ b/tests/lib
@@ -238,5 +238,6 @@ t-drs-test () {
 	export DGIT_TEST_TESTNAME="$testname"
 	export ADTTMP=$tmp
 	cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
+	cp $root/tests/suites $tmp/.
 	exec "${0///drs-//}" "$@"
 }
-- 
2.30.2