diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-25 07:23:18 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-07-25 07:23:23 +0100 |
commit | 35b159e1e9e8d170732c8a5ca5dd58d3a3c3bcda (patch) | |
tree | ba636ff62b51ca8f84c1400dbca71ea54574023d /infra/dgit-repos-policy-debian | |
parent | 94fa2654f99556f17b0c98712b29d1bec3a8f91b (diff) |
messages: Be a lot more friendly about NEW in particular
And also add a couple of `please's. Closes:#904448.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'infra/dgit-repos-policy-debian')
-rwxr-xr-x | infra/dgit-repos-policy-debian | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian index 990abd2..e85e92c 100755 --- 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 () { |