chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: Crash if we forgot to set $do_split_brain
[dgit.git]
/
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 $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
# 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;
}
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;
}
fail __ "dgit: --include-dirty is not supported in split view quilt mode"
if do_split_brain() && $includedirty;
}