dgit-repos-server: some better error msgs, more tests

1 files changed, 5 insertions, 5 deletions

diff --git a/dgit-repos-server b/dgit-repos-server
index 33c18f1..add5424 100755
--- a/dgit-repos-server
+++ b/dgit-repos-server
@@ -282,25 +282,25 @@ sub readupdates () {
 	m/^(\S+) (\S+) (\S+)$/ or die "$_ ?";
 	my ($old, $sha1, $refname) = ($1, $2, $3);
 	if ($refname =~ m{^refs/tags/(?=debian/)}) {
-	    die if defined $tagname;
+	    reject "pushing multiple tags!" if defined $tagname;
 	    $tagname = $'; #';
 	    $tagval = $sha1;
 	    reject "tag $tagname already exists -".
 		" not replacing previously-pushed version"
 		if $old =~ m/[^0]/;
 	} elsif ($refname =~ m{^refs/dgit/}) {
-	    die if defined $suite;
+	    reject "pushing multiple heads!" if defined $suite;
 	    $suite = $'; #';
 	    $oldcommit = $old;
 	    $commit = $sha1;
 	} else {
-	    die;
+	    reject "pushing unexpected ref!";
 	}
     }
     STDIN->error and die $!;
 
-    die unless defined $tagname;
-    die unless defined $suite;
+    reject "push is missing tag ref update" unless defined $tagname;
+    reject "push is missing head ref update" unless defined $suite;
     debug " updates ok.";
 }