summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-08 03:24:19 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-08 23:43:36 +0000
commit2b9520f48d257c2a1d2c5a66d47ac711d1d45908 (patch)
treedbb168a57eac51e271af403103e035d3c71df027 /dgit
parente1c3f57c5e7dcedbb8df2ea6de3e84436cf375a8 (diff)
dsc import: Reorganise to make room for resolve_dsc_field_commit
No functional change Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit7
1 files changed, 4 insertions, 3 deletions
diff --git a/dgit b/dgit
index 775e03c..af9b182 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");