absurd git-apply fallback: defend against debian/patches/series being an unusual...

[dgit.git] / dgit

diff --git a/dgit b/dgit
index e22036b7d75ca308d3b605217a44ef71839b5505..62feb30281dacd5c0f1bb28aa5d109a9f9141c5b 100755 (executable)
--- 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));
@@ -5230,6 +5238,10 @@ sub parseopts () {
                push @ropts, $&;
                $forceopts{$1} = 1;
                $_='';
+           } elsif (m/^--force-/) {
+               print STDERR
+                   "$us: warning: ignoring unknown force option $_\n";
+               $_='';
            } elsif (m/^--dgit-tag-format=(old|new)$/s) {
                # undocumented, for testing
                push @ropts, $_;