From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58648C433B4 for ; Tue, 20 Apr 2021 15:45:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2098A613AE for ; Tue, 20 Apr 2021 15:45:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233059AbhDTPqH (ORCPT ); Tue, 20 Apr 2021 11:46:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233204AbhDTPqG (ORCPT ); Tue, 20 Apr 2021 11:46:06 -0400 Received: from mav.lukeshu.com (mav.lukeshu.com [IPv6:2001:19f0:5c00:8069:5400:ff:fe26:6a86]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71734C06174A for ; Tue, 20 Apr 2021 08:45:34 -0700 (PDT) Received: from lukeshu-dw-thinkpad (unknown [8.42.69.49]) by mav.lukeshu.com (Postfix) with ESMTPSA id CC8F280590; Tue, 20 Apr 2021 11:45:31 -0400 (EDT) Date: Tue, 20 Apr 2021 09:45:30 -0600 Message-ID: <87y2ddot7p.wl-lukeshu@lukeshu.com> From: Luke Shumaker To: Taylor Blau Cc: Luke Shumaker , git@vger.kernel.org, Luke Shumaker , Junio C Hamano , Elijah Newren , Jeff King , Johannes Schindelin , =?UTF-8?B?Tmd1eeG7hW4g?= =?ISO-8859-1?Q?Th?= =?ISO-8859-1?Q?=E1i_?= =?UTF-8?B?Tmfhu41j?= Duy Subject: Re: [PATCH 2/3] fast-export: rename --signed-tags='warn' to 'warn-verbatim' In-Reply-To: References: <20210419225441.3139048-1-lukeshu@lukeshu.com> <20210419225441.3139048-3-lukeshu@lukeshu.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.2 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 > > > > 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