From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 28 Jun 2019 21:55:53 +0000 (+0100)
Subject: dgit: Make $format available in build_or_push_prep_modes
X-Git-Tag: archive/debian/9.0~73
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7d2314ab7369c305eb1894fc07cb04f147590cf1;p=dgit.git

dgit: Make $format available in build_or_push_prep_modes

By returning it from determine_whether_split_brain.

No functional change yet.

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

diff --git a/dgit b/dgit
index adf22f66..c26b99f6 100755
--- a/dgit
+++ b/dgit
@@ -989,6 +989,8 @@ sub determine_whether_split_brain () {
 	$do_split_brain = 1;
     }
     $do_split_brain //= 0;
+
+    return ($format);
 }
 
 sub supplementary_message ($) {
@@ -6381,7 +6383,7 @@ sub build_or_push_prep_early () {
 }
 
 sub build_or_push_prep_modes () {
-    determine_whether_split_brain();
+    my ($format,) = determine_whether_split_brain();
 
     fail __ "dgit: --include-dirty is not supported with split view".
             " (including with view-splitting quilt modes)"