From 63f314691709644c0fb60c9ae4942f75714e4255 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 20 Oct 2016 15:05:59 +0100
Subject: [PATCH 1/1] split brain cache: Fix a wrong implicit reference to $_.
 Closes:#841383.

Otherwise we can get:

  Use of uninitialized value $_ in pattern match (m//) at /usr/bin/dgit
  line 4364.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog | 2 ++
 dgit             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 33b627ea..99e724d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ dgit (2.4~) unstable; urgency=low
     Usually the user is a maintainer using split brain, and we should rely
     on their own gbp configuration to specify the right check.
     Closes:#841100.
+  * split brain cache: Fix a wrong implicit reference to $_.
+    Closes:#841383.
 
  --
 
diff --git a/dgit b/dgit
index 08afd13d..d51220b0 100755
--- a/dgit
+++ b/dgit
@@ -4363,7 +4363,7 @@ sub quilt_check_splitbrain_cache ($$) {
     my $srcshash = Digest::SHA->new(256);
     my %sfs = ( %INC, '$0(dgit)' => $0 );
     foreach my $sfk (sort keys %sfs) {
-	next unless m/^\$0\b/ || m{^Debian/Dgit\b};
+	next unless $sfk =~ m/^\$0\b/ || $sfk =~ m{^Debian/Dgit\b};
 	$srcshash->add($sfk,"  ");
 	$srcshash->add(hashfile($sfs{$sfk}));
 	$srcshash->add("\n");
-- 
2.30.2