From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.tuxdriver.com (charlotte.tuxdriver.com [70.61.120.58]) by dpdk.org (Postfix) with ESMTP id EC5C55A4D for ; Tue, 15 Dec 2015 15:16:49 +0100 (CET) Received: from hmsreliant.think-freely.org ([2001:470:8:a08:7aac:c0ff:fec2:933b] helo=localhost) by smtp.tuxdriver.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1a8qPH-0006rm-Gk; Tue, 15 Dec 2015 09:16:48 -0500 Date: Tue, 15 Dec 2015 09:16:40 -0500 From: Neil Horman To: Panu Matilainen Message-ID: <20151215141640.GA25595@hmsreliant.think-freely.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) X-Spam-Score: -1.0 (-) X-Spam-Status: No Cc: dev@dpdk.org Subject: Re: [dpdk-dev] [PATCH] scripts: fix abi-validator regression when revision is a tag X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Dec 2015 14:16:50 -0000 On Tue, Dec 15, 2015 at 03:55:15PM +0200, Panu Matilainen wrote: > Commit 9cbae2aa64eb managed to break the only previously supported > case where a tag is used as a revision, due to git show output > differing between tags and other objects. The hash is on the last > line of the output in both cases though so just grab that. > > Fixes: 9cbae2aa64eb ("scripts: support any git revisions as ABI validation range") > Signed-off-by: Panu Matilainen > --- > scripts/validate-abi.sh | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/validate-abi.sh b/scripts/validate-abi.sh > index 8d7be24..c36ad61 100755 > --- a/scripts/validate-abi.sh > +++ b/scripts/validate-abi.sh > @@ -121,8 +121,8 @@ then > cleanup_and_exit 1 > fi > > -HASH1=$(git show -s --format=%H "$TAG1" -- 2> /dev/null) > -HASH2=$(git show -s --format=%H "$TAG2" -- 2> /dev/null) > +HASH1=$(git show -s --format=%H "$TAG1" -- 2> /dev/null | tail -1) > +HASH2=$(git show -s --format=%H "$TAG2" -- 2> /dev/null | tail -1) > > # Make sure our tags exist > res=$(validate_tags) > -- > 2.5.0 > > Acked-by: Neil Horman