summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-23 16:57:23 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-30 19:50:47 +0000
commit61b85b99276ae505f3c6712e2caa0251643d0db8 (patch)
tree6d8b95ba51165752289eefd23754f0b2ec1d0d29 /dgit
parent50442a0454ed323e0fce646d5ebfd213fd7051a9 (diff)
Provide --force-changes-origs-exactly
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit5
1 files changed, 3 insertions, 2 deletions
diff --git a/dgit b/dgit
index 79618d9..5be5c75 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: