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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham 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 D9112C63777 for ; Mon, 30 Nov 2020 17:17:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 90BDD2073C for ; Mon, 30 Nov 2020 17:17:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387404AbgK3RRW (ORCPT ); Mon, 30 Nov 2020 12:17:22 -0500 Received: from sandeen.net ([63.231.237.45]:59064 "EHLO sandeen.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387403AbgK3RRV (ORCPT ); Mon, 30 Nov 2020 12:17:21 -0500 Received: from liberator.sandeen.net (liberator.sandeen.net [10.0.0.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by sandeen.net (Postfix) with ESMTPSA id 363F4EDD; Mon, 30 Nov 2020 11:16:27 -0600 (CST) Subject: Re: [PATCH 1/5] libxfs-apply: don't add duplicate headers To: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org References: <160633667604.634603.7657982642827987317.stgit@magnolia> <160633668210.634603.16132006317248436755.stgit@magnolia> <4bc2eb57-a5e8-59e5-9c69-0d8767df4796@sandeen.net> <20201130171323.GA143049@magnolia> From: Eric Sandeen Message-ID: <38729061-ff5b-bde2-35cd-403dd9032102@sandeen.net> Date: Mon, 30 Nov 2020 11:16:40 -0600 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: <20201130171323.GA143049@magnolia> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On 11/30/20 11:13 AM, Darrick J. Wong wrote: > On Wed, Nov 25, 2020 at 03:12:39PM -0600, Eric Sandeen wrote: >> On 11/25/20 2:38 PM, Darrick J. Wong wrote: >>> From: Darrick J. Wong >>> >>> When we're backporting patches from libxfs, don't add a S-o-b header if >>> there's already one at the end of the headers of the patch being ported. >>> >>> That way, we avoid things like: >>> Signed-off-by: Darrick J. Wong >>> Signed-off-by: Darrick J. Wong >> >> But it will still not add my additional SOB if I merge something across to >> userspace that starts out with: >> >> Signed-off-by: Eric Sandeen >> Reviewed-by: Dave Chinner >> Signed-off-by: Darrick J. Wong >> >> And I always felt like the committer should be adding their SOB to the end of >> the chain when they move code from one place to another, especially if any >> tweaks got made along the way. >> >> IOWs I see the rationale for removing duplicate /sequential/ SOBs, but not >> for removing duplicate SOBs in general. >> >> Am I thinking about that wrong? > > add_header is different from last time -- whereas before it would search > the entire $hdrfile for $hdr and add $hdr if it didn't find a match, now > it only looks at the last line of $hdrfile for a match. I'm sorry, I visually checked and thought it was same as last time. Will look again, more closely. Thanks, -Eric > For your example above, it would not add another "SOB: Darrick" because > there's already one at the bottom of the headers; but it would add > another "SOB: Eric" because this commit acquired other tags after your > first signoff. > > --D > >>> --- >>> tools/libxfs-apply | 14 +++++++++++--- >>> 1 file changed, 11 insertions(+), 3 deletions(-) >>> >>> >>> diff --git a/tools/libxfs-apply b/tools/libxfs-apply >>> index 3258272d6189..9271db380198 100755 >>> --- a/tools/libxfs-apply >>> +++ b/tools/libxfs-apply >>> @@ -193,6 +193,14 @@ filter_xfsprogs_patch() >>> rm -f $_libxfs_files >>> } >>> >>> +add_header() >>> +{ >>> + local hdr="$1" >>> + local hdrfile="$2" >>> + >>> + tail -n 1 "$hdrfile" | grep -q "^${hdr}$" || echo "$hdr" >> "$hdrfile" >>> +} >>> + >>> fixup_header_format() >>> { >>> local _source=$1 >>> @@ -280,13 +288,13 @@ fixup_header_format() >>> sed -i '${/^[[:space:]]*$/d;}' $_hdr.new >>> >>> # Add Signed-off-by: header if specified >>> - if [ ! -z ${SIGNED_OFF_BY+x} ]; then >>> - echo "Signed-off-by: $SIGNED_OFF_BY" >> $_hdr.new >>> + if [ ! -z ${SIGNED_OFF_BY+x} ]; then >>> + add_header "Signed-off-by: $SIGNED_OFF_BY" $_hdr.new >>> else # get it from git config if present >>> SOB_NAME=`git config --get user.name` >>> SOB_EMAIL=`git config --get user.email` >>> if [ ! -z ${SOB_NAME+x} ]; then >>> - echo "Signed-off-by: $SOB_NAME <$SOB_EMAIL>" >> $_hdr.new >>> + add_header "Signed-off-by: $SOB_NAME <$SOB_EMAIL>" $_hdr.new >>> fi >>> fi >>> >>> >