From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 5 Jul 2019 12:59:04 +0000 (+0100)
Subject: dgit: Break out format_quiltmode_splitting
X-Git-Tag: archive/debian/9.1~92
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ec238523ed68bcff1b4a4a09cb511f8994649050;hp=acb8139b0c7f4de6287ab2c347170c88da8c89ad;p=dgit.git

dgit: Break out format_quiltmode_splitting

No functional change.

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

diff --git a/dgit b/dgit
index c23ffa65..c208e4ea 100755
--- a/dgit
+++ b/dgit
@@ -300,6 +300,10 @@ sub deliberately_not_fast_forward () {
 sub quiltmode_splitting () {
     $quilt_mode =~ m/gbp|dpm|unapplied|baredebian/;
 }
+sub format_quiltmode_splitting ($) {
+    my ($format) = @_;
+    return madformat_wantfixup($format) && quiltmode_splitting();
+}
 
 sub do_split_brain () { !!($do_split_brain // confess) }
 
@@ -985,7 +989,7 @@ sub determine_whether_split_brain () {
 
     printdebug "format $format, quilt mode $quilt_mode\n";
 
-    if (madformat_wantfixup($format) && quiltmode_splitting()) {
+    if (format_quiltmode_splitting $format) {
 	$splitview_mode ne 'never' or
 	    fail f_ "dgit: quilt mode \`%s' (for format \`%s')".
 	            " implies split view, but split-view set to \`%s'",