From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 28 Jun 2019 14:10:19 +0000 (+0100)
Subject: dgit: Break out determine_whether_split_brain
X-Git-Tag: archive/debian/9.0~93
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=7318599a1198a7b29082a9c4c7a6a4f42ddd8d92

dgit: Break out determine_whether_split_brain

No functional change.

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

diff --git a/dgit b/dgit
index 89b14df7..d09ae5f4 100755
--- a/dgit
+++ b/dgit
@@ -6360,13 +6360,18 @@ sub build_or_push_prep_early () {
     $dscfn = dscfn($version);
 }
 
-sub build_or_push_prep_modes () {
+sub determine_whether_split_brain () {
     my ($format,) = get_source_format();
     printdebug "format $format, quilt mode $quilt_mode\n";
     if (madformat_wantfixup($format) && quiltmode_splitbrain()) {
 	$do_split_brain = 1;
     }
     $do_split_brain //= 0;
+}
+
+sub build_or_push_prep_modes () {
+    determine_whether_split_brain();
+
     fail __ "dgit: --include-dirty is not supported in split view quilt mode"
 	if do_split_brain() && $includedirty;
 }