From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 6 Jan 2019 16:13:42 +0000 (+0000)
Subject: dgit: generate_commits_from_dsc: Move up $upstreamv
X-Git-Tag: archive/debian/8.3~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=35c93d228a9287b0c66fdfeba971c7a404566f17;p=dgit.git

dgit: generate_commits_from_dsc: Move up $upstreamv

We will want this in a moment.  No functional change.

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

diff --git a/dgit b/dgit
index e9f73918..5684ba9a 100755
--- a/dgit
+++ b/dgit
@@ -2210,6 +2210,7 @@ sub generate_commits_from_dsc () {
     changedir $playground;
 
     my $bpd_abs = bpd_abs();
+    my $upstreamv = upstreamversion $dsc->{version};
     my @dfi = dsc_files_info();
 
     foreach my $fi (@dfi) {
@@ -2262,7 +2263,6 @@ sub generate_commits_from_dsc () {
     # from the debian/changelog, so we record the tree objects now and
     # make them into commits later.
     my @tartrees;
-    my $upstreamv = upstreamversion $dsc->{version};
     my $orig_f_base = srcfn $upstreamv, '';
 
     foreach my $fi (@dfi) {