From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 8 Jan 2017 03:24:19 +0000 (+0000)
Subject: dsc import: Reorganise to make room for resolve_dsc_field_commit
X-Git-Tag: archive/debian/3.0~59
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2b9520f48d257c2a1d2c5a66d47ac711d1d45908;hp=e1c3f57c5e7dcedbb8df2ea6de3e84436cf375a8;p=dgit.git

dsc import: Reorganise to make room for resolve_dsc_field_commit

No functional change

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

diff --git a/dgit b/dgit
index 775e03cc..af9b182f 100755
--- a/dgit
+++ b/dgit
@@ -6023,10 +6023,11 @@ sub cmd_import_dsc {
     parse_dscdata();
 
     $package = getfield $dsc, 'Source';
-    parse_dsc_field($dsc, "Dgit metadata in .dsc");
 
-    if (defined $dsc_hash
-	&& !forceing [qw(import-dsc-with-dgit-field)]) {
+    parse_dsc_field($dsc, "Dgit metadata in .dsc")
+	unless forceing [qw(import-dsc-with-dgit-field)];
+
+    if (defined $dsc_hash) {
 	progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
 	my @cmd = (qw(sh -ec),
 		   "echo $dsc_hash | git cat-file --batch-check");