From ec238523ed68bcff1b4a4a09cb511f8994649050 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 5 Jul 2019 13:59:04 +0100 Subject: dgit: Break out format_quiltmode_splitting No functional change. Signed-off-by: Ian Jackson --- dgit | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'dgit') diff --git a/dgit b/dgit index c23ffa6..c208e4e 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'", -- cgit v1.2.3