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.1: drop remark about sbuild not building arch-independent
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 171249f771e1716a9eb0b39675c460780597291e..781435861ecb05b1c816a440364425746abae6f7 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-1973,7
+1973,7
@@
sub cmd_new_upstream () {
$new_version = (new Dpkg::Version "$spec_version-1", check => 1);
}
$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) =
my $new_upstream_version = upstreamversion $new_version;
my $new_upstream_used;
($new_upstream, $new_upstream_used) =
@@
-2697,9
+2697,10
@@
END
if (!@upstreams) {
if ($do_tags) {
my @tried;
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) {
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,
};
push @upstreams, { Commit => $ups_rev,
Source => $this,
};
@@
-2949,7
+2950,7
@@
getoptions_main
'experimental-merge-resolution!', \$opt_merges,
'-i:s' => sub {
my ($opt,$val) = @_;
'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) ];
if length $val;
confess if $opt_defaultcmd_interactive; # should not happen
$opt_defaultcmd_interactive = [ qw(-i) ];