X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=inline;f=dgit;h=7c282532b044daaf9afd64337c5fcb0418af2499;hb=d45493f37387ea36757a1749acb22626b4843645;hp=555e1c00905f30f0da4c18f54ac40c39b8d59ae8;hpb=7bff1293fb88d8cd1c3548aaf7a04fdbc12724d3;p=dgit.git diff --git a/dgit b/dgit index 555e1c00..7c282532 100755 --- a/dgit +++ b/dgit @@ -5889,9 +5889,10 @@ sub cmd_import_dsc { parse_dscdata(); my $dgit_commit = $dsc->{$ourdscfield[0]}; - if (defined $dgit_commit && - !forceing [qw(import-dsc-with-dgit-field)]) { + if (defined $dgit_commit + && !forceing [qw(import-dsc-with-dgit-field)]) { $dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc"; + $dgit_commit = $&; progress "dgit: import-dsc of .dsc with Dgit field, using git hash"; my @cmd = (qw(sh -ec), "echo $dgit_commit | git cat-file --batch-check");