diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-08 03:24:40 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-09 02:18:16 +0000 |
commit | 848d950785e8b6442835824a9995fcea83541132 (patch) | |
tree | 4221ce4d853e4ac1dd6ddef25401f36d36a56c5c /dgit | |
parent | a762a10328bbb70f70f32677ef15459f411249d6 (diff) |
dsc import: Call resolve_dsc_field_commit
No functional change
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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; |