summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-05-31 20:17:16 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-28 12:45:38 +0100
commit6a9372d21a3816e93c2096df650c15f2a1227d1d (patch)
treec638cf442079fa19e0947ff8d01fab5c08358947 /dgit
parenta05f4fe4748721c6bf0afc68a20eb3fd007150c5 (diff)
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>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit b/dgit
index a6cda1e..6a351f9 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);