Import: Allow --force to enable/disable

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

1 files changed, 9 insertions, 1 deletions

diff --git a/dgit b/dgit
index 98928e3..62feb30 100755
--- a/dgit
+++ b/dgit
@@ -76,7 +76,9 @@ our $tagformatfn;
 
 our %forceopts = map { $_=>0 }
     qw(unrepresentable unsupported-source-format
-       dsc-changes-mismatch);
+       dsc-changes-mismatch
+       import-gitapply-absurd
+       import-gitapply-no-absurd);
 
 our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)");
 
@@ -1976,9 +1978,15 @@ END
 		$path = "$absurdity:$path";
 		progress "$us: trying slow absurd-git-apply...";
 		rename "../../gbp-pq-output","../../gbp-pq-output.0"
+		    or $!==ENOENT
 		    or die $!;
 	    }
 	    eval {
+		die "forbid absurd git-apply\n" if $use_absurd
+		    && forceing [qw(import-gitapply-no-absurd)];
+		die "only absurd git-apply!\n" if !$use_absurd
+		    && forceing [qw(import-gitapply-absurd)];
+
 		local $ENV{PATH} = $path if $use_absurd;
 
 		my @showcmd = (gbp_pq, qw(import));