diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-31 15:32:43 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-05-31 15:46:56 +0100 |
commit | 683b0eb026fa6b43cc0a9ae122764f9a5d031f59 (patch) | |
tree | a67cdf1fc8cfd3fea059ffc9748f2dc0714f93cf /infra/dgit-repos-server | |
parent | fd9a321fa5de1ad724032a7d9c38f77f7e99d946 (diff) |
Infra: Allow FRESHREPO to override "tag already exists"
drs-push-rejects test needs updating too.
Diffstat (limited to 'infra/dgit-repos-server')
-rwxr-xr-x | infra/dgit-repos-server | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server index f5dd5aa..e2bec01 100755 --- a/infra/dgit-repos-server +++ b/infra/dgit-repos-server @@ -447,6 +447,8 @@ sub main__git_receive_pack () { our ($tagname, $tagval, $suite, $oldcommit, $commit); our ($version, %tagh); +our ($tagexists_error); + sub readupdates () { printdebug " updates ...\n"; while (<STDIN>) { @@ -458,7 +460,7 @@ sub readupdates () { reject "pushing multiple tags!" if defined $tagname; $tagname = $'; #'; $tagval = $sha1; - reject "tag $tagname already exists -". + $tagexists_error= "tag $tagname already exists -". " not replacing previously-pushed version" if $old =~ m/[^0]/; } elsif ($refname =~ m{^refs/dgit/}) { @@ -781,6 +783,14 @@ sub checks () { join(",",@deliberatelies)); $policy = policyhook(NOFFCHECK|FRESHREPO, 'push', @policy_args); + if (defined $tagexists_error) { + if ($policy & FRESHREPO) { + printdebug "ignoring tagexists_error: $tagexists_error\n"; + } else { + reject $tagexists_error; + } + } + checktagnoreplay(); checksuite(); |