$new_version = (new Dpkg::Version "$spec_version-1", check => 1);
}
- my $new_upstream = shift @ARGV;
+ my $new_upstream = (@ARGV && $ARGV[0] !~ m{^-}) ? shift @ARGV : undef;
my $new_upstream_version = upstreamversion $new_version;
my $new_upstream_used;
($new_upstream, $new_upstream_used) =
if (!@upstreams) {
if ($do_tags) {
my @tried;
- my $ups_rev = upstream_commitish_search $version, \@tried;
+ my ($ups_tag, $ups_rev) =
+ upstream_commitish_search $version, \@tried;
if ($ups_rev) {
- my $this = f_ "git tag %s", $tried[-1];
+ my $this = f_ "git tag %s", $ups_tag;
push @upstreams, { Commit => $ups_rev,
Source => $this,
};
'experimental-merge-resolution!', \$opt_merges,
'-i:s' => sub {
my ($opt,$val) = @_;
- badusage f_ "%s: no cuddling to -i for git-rebase", $us
+ badusage f_ "%s: with git-debrebase, get-rebase -i option may only be followed by more options (as separate arguments)", $us
if length $val;
confess if $opt_defaultcmd_interactive; # should not happen
$opt_defaultcmd_interactive = [ qw(-i) ];