#
# git protocol proxy to check dgit pushes etc.
#
-# Copyright (C) 2014-2016 Ian Jackson
+# Copyright (C) 2014-2017,2019 Ian Jackson
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
if ($dgititemfn->()) {
} elsif (s/^distro\=(\S+) //) {
$distrofn->($1);
- } elsif (s/^[-+.=0-9a-z]\S* //) {
+ } elsif (s/^([-+.=0-9a-z]\S*) //) {
+ printdebug " parsetag ignoring unrecognised \`$1'\n";
} else {
die "unknown dgit info in tag ($_)";
}
$upstreamc = $1;
} elsif (s/^upstream-tag=(\S+) //) {
$upstreamt = $1;
- } elsif (s/^quilt=([-+0-9a-z]+) //) {
+ } elsif (s/^--quilt=([-+0-9a-z]+) //) {
$quilt = $1;
} else {
return 0;
$clogf->('Version', $version);
$clogf->('Source', $package);
- @fetch = (@dgit, qw(fetch), $suite);
+ @fetch = (@dgit, qw(--for-push fetch), $suite);
debugcmd "+",@_;
$!=0; $?=-1;
if (system @fetch) {
if ($quilt =~ m/baredebian/) {
die "needed upstream commmitish with --quilt=baredebian"
unless defined $upstreamc;
- push @dgitcmd, "--upstream-commitish=$upstreamc";
+ push @dgitcmd, "--upstream-commitish=refs/tags/$upstreamt";
}
}
push @dgitcmd, qw(push-source --new --overwrite), $suite;