summaryrefslogtreecommitdiff
path: root/Debian
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-29 01:56:21 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-29 01:57:37 +0100
commit661c4c84e3ff82d1bda7c7dcaf6400dc267176b9 (patch)
tree1555579a066adb11d13b7dd6cb5487fb4c11770a /Debian
parent921e405f6b51d0c9efbe9b7cfd040b276b1194bd (diff)
Dgit.pm: resolve_upstream_version: Return a message too
No functional change for existing callers. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'Debian')
-rw-r--r--Debian/Dgit.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 22cef21..d60de77 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -635,6 +635,7 @@ sub resolve_upstream_version ($$) {
my ($new_upstream, $upstream_version) = @_;
my $used = $new_upstream;
+ my $message = __ 'using specified upstream commitish';
if (!defined $new_upstream) {
my @tried;
$new_upstream = upstream_commitish_search $upstream_version, \@tried;
@@ -646,10 +647,11 @@ sub resolve_upstream_version ($$) {
"@tried";
}
$used = $tried[-1];
+ $message = f_ 'using upstream from git tag %s', $used;
}
$new_upstream = git_rev_parse $new_upstream;
- return ($new_upstream, $used);
+ return ($new_upstream, $used, $message);
# used is a human-readable idea of what we found
}