Ian Jackson [18/May 11:53am +01] wrote: > Maybe we should have something like the following message: > > Previous git-based (dgit or tag2upload) upload into NEW was superseded by a > non-git-based upload (dput) which was subsequently ACCEPTed. > We don't know if the non-git-based upload contained a history rewerite. > > followed by the rest of the usual $questionable_head_msg_core: > > Unfortunately, we cannot determine automatically what should happen. > You will have to pass either --untaint-history > (aka --deliberately-include-questionable-history) > or --deliberately-not-fast-forward or 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 DEBIAN - TAINTED HISTORY in dgit(7) (from >=forky or trixie-backports) > or the descriptions of these options in dgit(1),
LGTM, though I suggest dropping "(aka --deliberately-include-questionable-history)" for brevity. -- Sean Whitton
signature.asc
Description: PGP signature
