X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=af9b182fcf5e7952479d8778f517f6da53e4f272;hb=2b9520f48d257c2a1d2c5a66d47ac711d1d45908;hp=775e03ccd6ac01ee64232a820dee6a343b52ed14;hpb=e1c3f57c5e7dcedbb8df2ea6de3e84436cf375a8;p=dgit.git 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");