chiark / gitweb /
dgit: Crash if we forgot to set $do_split_brain
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 14:09:13 +0000 (15:09 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 15:59:48 +0000 (16:59 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit

diff --git a/dgit b/dgit
index 03bf6c370995d8862c015e1687217e886f28df4a..89b14df7fb4e7ea58f5bf8fc327293150132bde4 100755 (executable)
--- 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;
 }