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 907ebfeb755e0c3b00613f502266f7e8d154bda2..c11151305b2cdbc66003811692521ae3fec25106 100755 (executable)
--- 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;