From 7318599a1198a7b29082a9c4c7a6a4f42ddd8d92 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 28 Jun 2019 15:10:19 +0100 Subject: dgit: Break out determine_whether_split_brain No functional change. Signed-off-by: Ian Jackson --- dgit | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'dgit') diff --git a/dgit b/dgit index 89b14df..d09ae5f 100755 --- a/dgit +++ b/dgit @@ -6360,13 +6360,18 @@ sub build_or_push_prep_early () { $dscfn = dscfn($version); } -sub build_or_push_prep_modes () { +sub determine_whether_split_brain () { my ($format,) = get_source_format(); printdebug "format $format, quilt mode $quilt_mode\n"; if (madformat_wantfixup($format) && quiltmode_splitbrain()) { $do_split_brain = 1; } $do_split_brain //= 0; +} + +sub build_or_push_prep_modes () { + determine_whether_split_brain(); + fail __ "dgit: --include-dirty is not supported in split view quilt mode" if do_split_brain() && $includedirty; } -- cgit v1.2.3