summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-28 15:10:19 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-28 16:59:48 +0100
commit7318599a1198a7b29082a9c4c7a6a4f42ddd8d92 (patch)
tree841d2445ea22f3aa2422ddff728d92aa50baad95
parentdc9d5839ec3ac78ddad9b48f813e5f5da9413192 (diff)
dgit: Break out determine_whether_split_brain
No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xdgit7
1 files changed, 6 insertions, 1 deletions
diff --git a/dgit b/dgit
index 89b14df..d09ae5f 100755
--- a/dgit
+++ b/dgit
@@ -6360,13 +6360,18 @@ sub build_or_push_prep_early () {
$dscfn = dscfn($version);
}
-sub build_or_push_prep_modes () {
+sub determine_whether_split_brain () {
my ($format,) = get_source_format();
printdebug "format $format, quilt mode $quilt_mode\n";
if (madformat_wantfixup($format) && quiltmode_splitbrain()) {
$do_split_brain = 1;
}
$do_split_brain //= 0;
+}
+
+sub build_or_push_prep_modes () {
+ determine_whether_split_brain();
+
fail __ "dgit: --include-dirty is not supported in split view quilt mode"
if do_split_brain() && $includedirty;
}