From d45493f37387ea36757a1749acb22626b4843645 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Jan 2017 17:27:25 +0000
Subject: dgit: import-dsc: Parse `Dgit:' field properly, using only \w+

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

(limited to 'dgit')

diff --git a/dgit b/dgit
index 555e1c0..7c28253 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");
-- 
cgit v1.2.3