From dc9d5839ec3ac78ddad9b48f813e5f5da9413192 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 28 Jun 2019 15:09:13 +0100 Subject: dgit: Crash if we forgot to set $do_split_brain Signed-off-by: Ian Jackson --- dgit | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dgit b/dgit index 03bf6c3..89b14df 100755 --- a/dgit +++ b/dgit @@ -173,7 +173,7 @@ autoflush STDOUT 1; our $supplementary_message = ''; our $made_split_brain = 0; -our $do_split_brain = 0; +our $do_split_brain; # Interactions between quilt mode and split brain # (currently, split brain only implemented iff @@ -6366,6 +6366,7 @@ sub build_or_push_prep_modes () { if (madformat_wantfixup($format) && quiltmode_splitbrain()) { $do_split_brain = 1; } + $do_split_brain //= 0; fail __ "dgit: --include-dirty is not supported in split view quilt mode" if do_split_brain() && $includedirty; } -- cgit v1.2.3