From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 3 Aug 2018 13:11:05 +0000 (+0100)
Subject: git-debrebase: Use upstreamversion rather than open-coding
X-Git-Tag: archive/debian/6.5~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4d1ab1d76fd6d96ff09550f877fa3fc904fa6bb7;p=dgit.git

git-debrebase: Use upstreamversion rather than open-coding

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 907ebfeb..c1115130 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1187,8 +1187,7 @@ sub do_stitch ($;$) {
 sub resolve_upstream_version ($$) {
     my ($new_upstream, $version) = @_;
 
-    my $new_upstream_version = "$version";
-    $new_upstream_version =~ s/-.*?$//;;
+    my $new_upstream_version = upstreamversion $version;
 
     if (!defined $new_upstream) {
 	my @tried;