From 024f99fe973837436bfff54c78b8a1fb1c698c61 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 17 Jul 2019 03:16:29 +0100 Subject: Dgit.pm: resolve_upstream_version: Report tag, where sensible This affect what is show in commit messages (including the parseable parts) made by dgit and git-debrebase. Now they prefer to refer to the tag name if the caller specified refs/tags/ and the tag name is a nice one. This is not expected to make much difference for human callers (who will probably not explicitly qualify their tag refs). But it will make a difference for scripts. Signed-off-by: Ian Jackson --- Debian/Dgit.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Debian') diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index a5030df..9c1a08e 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -656,7 +656,10 @@ sub resolve_upstream_version ($$) { } $used = $tried[-1]; $message = f_ 'using upstream from git tag %s', $used; - } + } elsif ($new_upstream =~ m{^refs/tags/($versiontag_re)$}s) { + $message = f_ 'using upstream from git tag %s', $1; + $used = $1; + } $new_upstream = git_rev_parse $new_upstream; return ($new_upstream, $used, $message); -- cgit v1.2.3