diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-05 13:59:04 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-07-05 14:35:29 +0100 |
commit | ec238523ed68bcff1b4a4a09cb511f8994649050 (patch) | |
tree | da87bcb325f954335cd41355e7e779eaf91f89b7 | |
parent | acb8139b0c7f4de6287ab2c347170c88da8c89ad (diff) |
dgit: Break out format_quiltmode_splitting
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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'", |