X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=infra%2Fdgit-repos-server;h=177829e9aeffce5ccd60a3e9a832f427c1623fa5;hb=b5e24ca3bdd371aa72e8bd095f86f0b3cbfbbee1;hp=b853162812981d0f03634589c3f6af8535ab4f28;hpb=42eccf599788b9e596b2200f13f9a379c7491d21;p=dgit.git diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server index b8531628..177829e9 100755 --- a/infra/dgit-repos-server +++ b/infra/dgit-repos-server @@ -1073,7 +1073,6 @@ our @hookenvs = qw(distro suitesfile suitesformasterfile policyhook # workrepo and destrepo handled ad-hoc sub mode_tag2upload () { - # PROTOTYPE # CALLER MUST PREVENT MULTIPLE CONCURRENT RUNS IN SAME CWD # If we fail (exit nonzero), caller should capture our stderr, # and retry some bounded number of times in some appropriate way @@ -1283,7 +1282,8 @@ END if (defined $quilt) { push @dgitcmd, "--quilt=$quilt"; if ($quilt =~ m/baredebian/) { - die "needed upstream commmitish with --quilt=baredebian"; + die "needed upstream commmitish with --quilt=baredebian" + unless defined $upstreamc; push @dgitcmd, "--upstream-commitish=$upstreamc"; } }