chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-repos-server: tag2upload: Cope with native packages
[dgit.git]
/
infra
/
dgit-repos-server
diff --git
a/infra/dgit-repos-server
b/infra/dgit-repos-server
index 68429eb73a13881614e33510f844648ab6fedd48..df0be6bf605720ac7636edf10683b00184e769ab 100755
(executable)
--- a/
infra/dgit-repos-server
+++ b/
infra/dgit-repos-server
@@
-1199,6
+1199,8
@@
END
my $quilt;
my $distro_ok;
my $quilt;
my $distro_ok;
+ confess if defined $upstreamt;
+
parsetag_general sub {
if (m/^(\S+) / && exists $need{$1}) {
$_ = $';
parsetag_general sub {
if (m/^(\S+) / && exists $need{$1}) {
$_ = $';
@@
-1244,8
+1246,6
@@
END
}
runcmd @fetch;
}
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);
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
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;
my @dgitcmd;
push @dgitcmd, @dgit;