chiark / gitweb /
dgit: push-source dies if user tried to include uncommitted changes
[dgit.git] / dgit
diff --git a/dgit b/dgit
index 2dd8ef1496fa702a627bb9c35a91b44ae905fb93..470c0fd9fde00d1b02d26b93e37530ee1ffc2d80 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -4758,6 +4758,8 @@ sub cmd_push {
 
 sub cmd_push_source {
     prep_push();
+    fail "dgit push-source: --include-dirty/--ignore-dirty does not make".
+      "sense with push-source!" if $includedirty;
     if ($changesfile) {
         my $changes = parsecontrol("$buildproductsdir/$changesfile",
                                    "source changes file");
@@ -7067,6 +7069,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');