dgit: Fix check for --include-dirty --quilt=<splitting>

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 7aae321a4c9fa574a1faba50f56cb10816964186..493828695680a3ee7f72f9c2660c83f257b0d751 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -6441,6 +6441,8 @@ sub build_or_push_prep_modes () {
     if (madformat_wantfixup($format) && quiltmode_splitbrain()) {
        $do_split_brain = 1;
     }
+    fail __ "dgit: --include-dirty is not supported in split view quilt mode"
+       if $do_split_brain && $includedirty;
 }
 
 sub build_prep_early () {
@@ -7578,11 +7580,6 @@ sub parseopts_late_defaults () {
        $$vr = $v;
     }
 
-    fail __ "dgit: --include-dirty is not supported in split view quilt mode"
-       # xxx this does not actually work, because $split brain is
-       #     not set this early
-       if $split_brain && $includedirty;
-
     if (!defined $cleanmode) {
        local $access_forpush;
        $cleanmode = access_cfg('clean-mode-newer', 'RETURN-UNDEF');