On Mon, 19 Apr 2021 18:27:35 -0600, Taylor Blau wrote: > > On Mon, Apr 19, 2021 at 04:54:40PM -0600, Luke Shumaker wrote: > > From: Luke Shumaker <lukeshu@xxxxxxxxxxx> > > > > But still keep --signed-tags=warn as an undocumented alias. This name > > is clearer as it has symmetry with warn-strip: > > > > action -> action > > +----------------------------+ -> +----------------------------+ > > msg? | verbatim | strip | -> msg? | verbatim | strip | > > | warn | warn-strip | -> | warn-verbatim | warn-strip | > > +----------------------------+ -> +----------------------------+ > > This table is rather confusing to me. What's unclear to me is what > "msg?" and "action" are referring to. After reading your patch, I think > it may be clearer to say: > > The --signed-tags option takes one of five arguments specifying how > to handle singed tags during export. Among these arguments, strip is > to warn-strip as verbatim is to warn. (The unmentioned argument is > 'abort', which stops the fast-export process entirely). That is, > signatures are either stripped or copied verbatim while exporting, > with or without a warning. > > Make clear that the "warn" option instructs fast-export to copy > signatures verbatim by matching the pattern (and calling the option > "warn-verbatim"). > > To maintain backwards compatibility, "warn" is still recognized as > an undocumented alias. Thank you, I'll take much of this wording. > > +test_expect_success 'signed-tags=warn' ' > > + git fast-export --signed-tags=warn sign-your-name >output 2>err && > > + grep PGP output && > > + test -s err > > +' > > + > > +test_expect_success 'signed-tags=warn-verbatim' ' > > + git fast-export --signed-tags=warn sign-your-name >output 2>err && > > s/warn/warn-verbatim ? Indeed, oops! I'll also add a comment clarifying that the signed-tags=warn test is testing for backward compatibility. -- Happy hacking, ~ Luke Shumaker
