changelog: start 9.14

[dgit.git] / infra / dgit-repos-policy-debian

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 990abd2b9b82f90f958bf44f91cca99b8c288772..ad21564383ff979aa2f608e7626d04131e1128e8 100755 (executable)
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # dgit repos policy hook script for Debian
 #
-# Copyright (C) 2015-2016  Ian Jackson
+# Copyright (C) 2015-2019  Ian Jackson
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -334,10 +334,19 @@ sub action_push () {
     if (deliberately('include-questionable-history')) {
        return 0;
     }
-    die "\nPackage is in NEW and has not been accepted or rejected yet;".
-       " use a --deliberately option to specify whether you are".
-       " keeping or discarding the previously pushed history. ".
-       " Please RTFM dgit(1).\n\n";
+    die <<END;
+
+Package is in NEW and has not been accepted or rejected yet.
+Unfortunately, we cannot determine automatically what should happen.
+You will have to pass either --deliberately-not-fast-forward or
+--deliberately-include-questionable-history to specify whether you are
+keeping or discarding the previously pushed history.
+
+The choice is important, to ensure that your git history is both
+suitable for public distribution and as useful as possible.  Please
+see the descriptions of these options in dgit(1).
+
+END
 }
 
 sub action_push_confirm () {
@@ -452,7 +461,7 @@ END
             $mustreject = 1;
        } else {
            $stderr .= <<END;
-Forcing due to --deliberately-$ovwhy
+Forcing due to $ovwhy
 END
             $untaintq ||= $poldbh->prepare(<<END);
                 DELETE FROM taints WHERE taint_id = ?
@@ -537,6 +546,7 @@ for (;;) {
        die unless defined $rcode;
 
        $poldbh->commit;
+       printdebug "poldbh commit\n";
     };
     last unless length $@;
     die $@ unless ref $@ eq $db_busy_exception;