summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit6
1 files changed, 5 insertions, 1 deletions
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'",