summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdgit3
1 files changed, 2 insertions, 1 deletions
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;
}