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 a6cda1e80ee565de52f944dce7f4e96456d1ca30..6a351f9d05754d82fed10248de28766ef6493d3f 100755 (executable)
--- 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);