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>

1 files changed, 5 insertions, 2 deletions

diff --git a/dgit b/dgit
index 583fe4a..45c935d 100755
--- a/dgit
+++ b/dgit
@@ -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($_);
     }
 }