X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=89b14df7fb4e7ea58f5bf8fc327293150132bde4;hb=dc9d5839ec3ac78ddad9b48f813e5f5da9413192;hp=03bf6c370995d8862c015e1687217e886f28df4a;hpb=7ef396b5c696d4de6b27630a91a0f6f2c006a030;p=dgit.git

diff --git a/dgit b/dgit
index 03bf6c37..89b14df7 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;
 }