From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 29 Jun 2019 00:56:21 +0000 (+0100)
Subject: Dgit.pm: resolve_upstream_version: Return a message too
X-Git-Tag: archive/debian/9.0~71
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=661c4c84e3ff82d1bda7c7dcaf6400dc267176b9

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>
---

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 22cef219..d60de77b 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
 }