From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 17 Jul 2019 02:16:29 +0000 (+0100)
Subject: Dgit.pm: resolve_upstream_version: Report tag, where sensible
X-Git-Tag: archive/debian/9.3~25
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=024f99fe973837436bfff54c78b8a1fb1c698c61

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 <ijackson@chiark.greenend.org.uk>
---

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index a5030df7..9c1a08e7 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);