X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=infra%2Fdgit-repos-server;fp=infra%2Fdgit-repos-server;h=df0be6bf605720ac7636edf10683b00184e769ab;hb=6fabc803cce029814512b9246403812e4c093f50;hp=68429eb73a13881614e33510f844648ab6fedd48;hpb=f7ca5b3659a09a796bbeb3cee93fbf3ab22755a4;p=dgit.git diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server index 68429eb7..df0be6bf 100755 --- a/infra/dgit-repos-server +++ b/infra/dgit-repos-server @@ -1199,6 +1199,8 @@ END my $quilt; my $distro_ok; + confess if defined $upstreamt; + parsetag_general sub { if (m/^(\S+) / && exists $need{$1}) { $_ = $'; @@ -1244,8 +1246,6 @@ END } runcmd @fetch; - $upstreamc eq git_rev_parse "refs/tags/$upstreamt" or die; - runcmd qw(git checkout -q), "refs/tags/$tagval"; @fetch = (@dgit, qw(fetch), $suite); @@ -1255,7 +1255,10 @@ END failedcmd @fetch unless $? == 4*256; } # this is just to get the orig, so we don't really care about the ref - runcmd qw(git deborig), "$upstreamc"; + if (defined $upstreamc) { + $upstreamc eq git_rev_parse "refs/tags/$upstreamt" or die; + runcmd qw(git deborig), "$upstreamc"; + } my @dgitcmd; push @dgitcmd, @dgit;