From 71adb54977f6ecda0911b9fbb4af7f785a76cb08 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 20 Oct 2016 00:23:17 +0100
Subject: [PATCH] dopush: Move $upstreamversion setting out to give it wider
 scope

No functional change yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dgit b/dgit
index e261a298..e489150e 100755
--- a/dgit
+++ b/dgit
@@ -3236,11 +3236,12 @@ END
     my $dgithead = $actualhead;
     my $maintviewhead = undef;
 
+    my $upstreamversion = $clogp->{Version};
+    $upstreamversion =~ s/-[^-]*$//;
+
     if (madformat_wantfixup($format)) {
 	# user might have not used dgit build, so maybe do this now:
 	if (quiltmode_splitbrain()) {
-	    my $upstreamversion = $clogp->{Version};
-	    $upstreamversion =~ s/-[^-]*$//;
 	    changedir $ud;
 	    quilt_make_fake_dsc($upstreamversion);
 	    my $cachekey;
-- 
2.30.2