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 109092bee36d39a7f257caa2d7144aa5430d6a3c..a6cda1e80ee565de52f944dce7f4e96456d1ca30 100755 (executable)
--- 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) =