From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 23 Oct 2016 15:57:23 +0000 (+0100)
Subject: Provide --force-changes-origs-exactly
X-Git-Tag: archive/debian/2.9~57
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=61b85b99276ae505f3c6712e2caa0251643d0db8

Provide --force-changes-origs-exactly

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

diff --git a/dgit b/dgit
index 79618d90..5be5c75b 100755
--- 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:
 
diff --git a/dgit.1 b/dgit.1
index f7f8dad5..c5dd6b90 100644
--- a/dgit.1
+++ b/dgit.1
@@ -744,6 +744,11 @@ dgit thinks that your git tree contains changes
 which dpkg-source is not able to represent.
 Your build or push will probably fail later.
 .TP
+.B --force-changes-origs-exactly
+Use the set of .origs specified in your .changes, exactly,
+without regard to what is in the archive already.
+The archive may well reject your upload.
+.TP
 .B --force-unsupported-source-format
 Carry on despite dgit not understanding your source package format.
 dgit will probably mishandle it.