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 () {
$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 = ?
die unless defined $rcode;
$poldbh->commit;
+ printdebug "poldbh commit\n";
};
last unless length $@;
die $@ unless ref $@ eq $db_busy_exception;