diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-16 21:02:38 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-23 17:01:38 +0100 |
commit | 37913654d58e03354aa4d5a6aa5afb9c5aeca6b7 (patch) | |
tree | 24a5ddf0218e0c4e8dfe876e242ad9b21762967c /dgit | |
parent | 8e9303a546371cfa631ff5f16ea4d7fdcfa6fad8 (diff) |
Provide --force-unrepresentable.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -73,7 +73,7 @@ our $tagformat_want; our $tagformat; our $tagformatfn; -our %forceopts = map { $_=>0 } (); +our %forceopts = map { $_=>0 } qw(unrepresentable); our %format_ok = map { $_=>1 } ("1.0","3.0 (native)","3.0 (quilt)"); @@ -4613,7 +4613,7 @@ END if (@unrepres) { print STDERR "dgit: cannot represent change: $_->[1]: $_->[0]\n" foreach @unrepres; - fail <<END; + forceable_fail [qw(unrepresentable)], <<END; HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)' END } |