From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 31 May 2019 19:13:46 +0000 (+0100)
Subject: dgit: split brain reorg: Check quilt cache iff $do_split_brain (1)
X-Git-Tag: archive/debian/9.0~130
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a05f4fe4748721c6bf0afc68a20eb3fd007150c5;p=dgit.git

dgit: split brain reorg: Check quilt cache iff $do_split_brain (1)

When $do_split_brain becomes set when !quiltmode_splitbrain(), we want
to check the cache even in the non split brain case.

Change in dopush, where we check the cache.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 109092be..a6cda1e8 100755
--- a/dgit
+++ b/dgit
@@ -4517,6 +4517,8 @@ END
 	# user might have not used dgit build, so maybe do this now:
 	if (quiltmode_splitbrain()) {
 	    $do_split_brain = 1;
+	}
+	if ($do_split_brain) {
 	    changedir $playground;
 	    my $cachekey;
 	    ($dgithead, $cachekey) =