po4a: Fix gitignore to actually ignore right .po4a.LANG.cfg

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

diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index 990abd2b9b82f90f958bf44f91cca99b8c288772..e85e92c5ebf4531ccc20229c2f4004ba6a49b598 100755 (executable)
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -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 () {