From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 Jul 2016 17:19:36 +0000 (+0100)
Subject: Split brain: Do not look at all of %INC for cache key
X-Git-Tag: archive/debian/2.0~262
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=80aef61fbb509932af0afcfd2c52281f50c95ca5;p=dgit.git

Split brain: Do not look at all of %INC for cache key

Look only at dgit and Debian/Dgit.

The prompt for this is that some of our submodules seem to dynamically
load some of their components depending on what dgit does, making the
cache key unstable.
---

diff --git a/dgit b/dgit
index 1e6be23d..a5685375 100755
--- a/dgit
+++ b/dgit
@@ -3015,6 +3015,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};
 	$srcshash->add($sfk,"  ");
 	$srcshash->add(hashfile($sfs{$sfk}));
 	$srcshash->add("\n");