From 848d950785e8b6442835824a9995fcea83541132 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 8 Jan 2017 03:24:40 +0000
Subject: [PATCH] dsc import: Call resolve_dsc_field_commit

No functional change

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

diff --git a/dgit b/dgit
index af9b182f..3ffcf77a 100755
--- a/dgit
+++ b/dgit
@@ -2769,7 +2769,8 @@ sub resolve_dsc_field_commit ($$) {
     return unless defined $dsc_hash;
 
     my $mapref =
-	$already_distro eq $dsc_distro || !$chase_dsc_distro 
+	defined $already_mapref &&
+	($already_distro eq $dsc_distro || !$chase_dsc_distro)
 	? $already_mapref : undef;
 
     my $do_fetch;
@@ -6029,6 +6030,9 @@ sub cmd_import_dsc {
 
     if (defined $dsc_hash) {
 	progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
+	resolve_dsc_field_commit undef, undef;
+    }
+    if (defined $dsc_hash) {
 	my @cmd = (qw(sh -ec),
 		   "echo $dsc_hash | git cat-file --batch-check");
 	my $objgot = cmdoutput @cmd;
-- 
2.30.2