From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 5 Jul 2019 15:04:00 +0000 (+0100)
Subject: dgit: determine_whether_split_brain: Make it take $format
X-Git-Tag: archive/debian/9.1~89
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1f982415c352e44ea4320cc1da93ed0f0ca60629;p=dgit.git

dgit: determine_whether_split_brain: Make it take $format

Rather than returning it.  Adjust the two call sites.
No functional change.

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

diff --git a/dgit b/dgit
index a8968478..cc0edd0c 100755
--- a/dgit
+++ b/dgit
@@ -977,9 +977,8 @@ sub notpushing () {
     parseopts_late_defaults();
 }
 
-sub determine_whether_split_brain () {
-    my ($format,) = get_source_format();
-
+sub determine_whether_split_brain ($) {
+    my ($format) = @_;
     {
 	local $access_forpush;
 	default_from_access_cfg(\$splitview_mode, 'split-view', 'auto',
@@ -997,8 +996,6 @@ sub determine_whether_split_brain () {
 	$do_split_brain = 1;
     }
     $do_split_brain //= 0;
-
-    return ($format);
 }
 
 sub supplementary_message ($) {
@@ -4887,7 +4884,7 @@ sub cmd_fetch {
 sub cmd_pull {
     parseopts();
     fetchpullargs();
-    determine_whether_split_brain();
+    determine_whether_split_brain get_source_format();
     if (do_split_brain()) {
 	my ($format, $fopts) = get_source_format();
 	madformat($format) and fail f_ <<END, $quilt_mode
@@ -6576,7 +6573,8 @@ sub build_or_push_prep_early () {
 }
 
 sub build_or_push_prep_modes () {
-    my ($format,) = determine_whether_split_brain();
+    my ($format) = get_source_format();
+    determine_whether_split_brain($format);
 
     fail __ "dgit: --include-dirty is not supported with split view".
             " (including with view-splitting quilt modes)"