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

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

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

Change the quilt fixup, just before generating a new multipatch
conversion.

No functional change.

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

diff --git a/dgit b/dgit
index a6cda1e8..6a351f9d 100755
--- a/dgit
+++ b/dgit
@@ -6161,7 +6161,7 @@ sub quilt_fixup_multipatch ($$$) {
 	chdir '..';
     }
 
-    if (quiltmode_splitbrain()) {
+    if ($do_split_brain) {
 	my $cachehit;
 	($cachehit, $splitbrain_cachekey) =
 	    quilt_check_splitbrain_cache($headref, $upstreamversion);