From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 25 Jul 2018 13:04:00 +0000 (+0800)
Subject: dgit: don't let the user pass --include-dirty in split brain mode
X-Git-Tag: archive/debian/6.0~29
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=67fc3a6fb0abda68f201893e16392f6d15ec16e3

dgit: don't let the user pass --include-dirty in split brain mode

It is not supported.

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 2dd8ef14..0a770cd0 100755
--- a/dgit
+++ b/dgit
@@ -7067,6 +7067,9 @@ sub parseopts_late_defaults () {
 
     $need_split_build_invocation ||= quiltmode_splitbrain();
 
+    fail "dgit: --include-dirty is not supported in split view quilt mode"
+	if $split_brain && $includedirty;
+
     if (!defined $cleanmode) {
 	local $access_forpush;
 	$cleanmode = access_cfg('clean-mode', 'RETURN-UNDEF');