From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 28 Jun 2019 14:13:17 +0000 (+0100)
Subject: dgit: Move determine_whether_split_brain further up the file
X-Git-Tag: archive/debian/9.0~92
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=222378544900b50217a2f3cf80478639a074beee;p=dgit.git

dgit: Move determine_whether_split_brain further up the file

No functional change.

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

diff --git a/dgit b/dgit
index d09ae5f4..5172c4dd 100755
--- a/dgit
+++ b/dgit
@@ -967,6 +967,15 @@ sub notpushing () {
     parseopts_late_defaults();
 }
 
+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 supplementary_message ($) {
     my ($msg) = @_;
     if (!$we_are_responder) {
@@ -6360,15 +6369,6 @@ sub build_or_push_prep_early () {
     $dscfn = dscfn($version);
 }
 
-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();