sub resolve_upstream_version ($$) {
my ($new_upstream, $upstream_version) = @_;
+ my $used = $new_upstream;
if (!defined $new_upstream) {
my @tried;
$new_upstream = upstream_commitish_search $upstream_version, \@tried;
" Check version, and specify upstream commitish explicitly.",
"@tried";
}
+ $used = $tried[-1];
}
$new_upstream = git_rev_parse $new_upstream;
- return $new_upstream;
+ return ($new_upstream, $used);
+ # used is a human-readable idea of what we found
}
sub cmd_new_upstream () {
my $new_upstream = shift @ARGV;
my $new_upstream_version = upstreamversion $new_version;
- $new_upstream =
+ my $new_upstream_used;
+ ($new_upstream, $new_upstream_used) =
resolve_upstream_version $new_upstream, $new_upstream_version;
record_ffq_auto();
my ($upstream_spec) = @ARGV;
my $upstream_version = upstreamversion $version;
- my $upstream =
+ my ($upstream, $upstream_used) =
resolve_upstream_version($upstream_spec, $upstream_version);
my ($old_head, $gdrlastinfo) = begin_convert_from();