chiark / gitweb /
Provide --force-changes-origs-exactly
[dgit.git] / dgit
diff --git a/dgit b/dgit
index 79618d90400f0a834ddd78a2d92a5005c4102aed..5be5c75bae3ac28fce662351ad930bb1f413ce8c 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -76,7 +76,7 @@ our $tagformatfn;
 
 our %forceopts = map { $_=>0 }
     qw(unrepresentable unsupported-source-format
-       dsc-changes-mismatch
+       dsc-changes-mismatch changes-origs-exactly
        import-gitapply-absurd
        import-gitapply-no-absurd);
 
@@ -3453,7 +3453,8 @@ END
 
     # Perhaps adjust .dsc to contain right set of origs
     changes_update_origs_from_dsc($dsc, $changes, $upstreamversion,
-                                 $changesfile);
+                                 $changesfile)
+       unless forceing [qw(changes-origs-exactly)];
 
     # Checks complete, we're going to try and go ahead: