diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-06 15:02:05 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-06-28 12:45:38 +0100 |
commit | 281574017d739c42bb264f20c1059efe42afa0aa (patch) | |
tree | 59f8f96e8dcc0484dfa3cfcc030a1dd0102fdc06 /dgit | |
parent | acf296f554f89df4b2cc3a8ac6458ef3da9b21d3 (diff) |
dgit: Fix check for --include-dirty --quilt=<splitting>
This needs to know whether we are actually in split brain mode.
build_or_push_prep_modes has just determined the answer, so put it
there.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -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'); |