NFC.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
}
sub resolve_upstream_version ($$) {
}
sub resolve_upstream_version ($$) {
- my ($new_upstream, $version) = @_;
-
- my $new_upstream_version = upstreamversion $version;
+ my ($new_upstream, $new_upstream_version) = @_;
if (!defined $new_upstream) {
my @tried;
if (!defined $new_upstream) {
my @tried;
}
$new_upstream = git_rev_parse $new_upstream;
}
$new_upstream = git_rev_parse $new_upstream;
- return ($new_upstream, $new_upstream_version);
}
sub cmd_new_upstream () {
}
sub cmd_new_upstream () {
}
my $new_upstream = shift @ARGV;
}
my $new_upstream = shift @ARGV;
- my $new_upstream_version;
- ($new_upstream, $new_upstream_version) =
- resolve_upstream_version $new_upstream, $new_version;
+ my $new_upstream_version = upstreamversion $new_version;
+ $new_upstream =
+ resolve_upstream_version $new_upstream, $new_upstream_version;
my ($upstream_spec) = @ARGV;
my ($upstream_spec) = @ARGV;
- my ($upstream, $upstream_version) =
- resolve_upstream_version($upstream_spec, $version);
+ my $upstream_version = upstreamversion $version;
+ my $upstream =
+ resolve_upstream_version($upstream_spec, $upstream_version);
my $old_head = get_head();
my $old_head = get_head();