diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-12-28 20:38:29 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2022-12-28 23:34:25 +0000 |
commit | 36217f56c3b4b10961d4919829e9a1bf21fd90dd (patch) | |
tree | 6bd70a8fbc2dc75c0b48961e41725a7c98b7e83a /dgit | |
parent | e6dc1107052f8177b8f4b6aeb01b3c00c946e367 (diff) |
dgit: deliberately: Centralise processing of TEST-dgit-only
Make this apply to every call to deliberately(). (Now it is wrong to
not use deliberately().)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -294,12 +294,15 @@ sub no_such_package () { sub deliberately ($) { my ($enquiry) = @_; - return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies; + return !!grep { + $_ eq "--deliberately-$enquiry" or + $_ eq "--deliberately-TEST-dgit-only-$enquiry" + } @deliberatelies; } sub deliberately_not_fast_forward () { foreach (qw(not-fast-forward fresh-repo)) { - return 1 if deliberately($_) || deliberately("TEST-dgit-only-$_"); + return 1 if deliberately($_); } } |