From 41b9d185ce39caddeb029f99c240faa4e5918ea2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 29 Jun 2019 12:43:16 +0100
Subject: [PATCH] dgit: baredebian: Reject --clean=git

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dgit b/dgit
index 831a60c5..ac68c657 100755
--- a/dgit
+++ b/dgit
@@ -6389,6 +6389,18 @@ sub clean_tree_check () {
 sub clean_tree () {
     # We always clean the tree ourselves, rather than leave it to the
     # builder (dpkg-source, or soemthing which calls dpkg-source).
+    if ($quilt_mode =~ m/baredebian/ and $cleanmode =~ m/git/) {
+	fail f_ <<END, $quilt_mode, $cleanmode;
+quilt mode %s (generally needs untracked upstream files)
+contradicts clean mode %s (which would delete them)
+END
+	# This is not 100% true: dgit build-source and push-source
+	# (for example) could operate just fine with no upstream
+	# source in the working tree.  But it doesn't seem likely that
+	# the user wants dgit to proactively delete such things.
+	# -wn, for example, would produce identical output without
+	# deleting anything from the working tree.
+    }
     if ($cleanmode =~ m{^dpkg-source}) {
 	my @cmd = @dpkgbuildpackage;
 	push @cmd, qw(-d) if $cleanmode =~ m{^dpkg-source-d};
-- 
2.30.2