chiark / gitweb /
dgit: Break out determine_whether_split_brain
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 14:10:19 +0000 (15:10 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 15:59:48 +0000 (16:59 +0100)
No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit

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