X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit-repos-server;h=3e74217a822159be9a602b2dd6549dd8af10eee4;hb=d16fb35f5d57b0337c2372de3a63430c17fb1226;hp=6170b69b022b0d96de3da6265329069fa665472f;hpb=ea53a4ec9dea6b19d1483e2a7e618a8f0702d92d;p=dgit.git diff --git a/dgit-repos-server b/dgit-repos-server index 6170b69b..3e74217a 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."; } @@ -391,12 +391,14 @@ sub dm_txt_check ($$) { while (