From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: Re: [PATCH] scripts: fix abi-validator regression when revision is a tag Date: Tue, 15 Dec 2015 15:20:22 +0100 Message-ID: <19875956.4ZuBgesspA@xps13> References: <20151215141640.GA25595@hmsreliant.think-freely.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Cc: dev@dpdk.org To: Panu Matilainen Return-path: Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by dpdk.org (Postfix) with ESMTP id A1B76374C for ; Tue, 15 Dec 2015 15:21:38 +0100 (CET) Received: by mail-wm0-f45.google.com with SMTP id n186so28115565wmn.0 for ; Tue, 15 Dec 2015 06:21:38 -0800 (PST) In-Reply-To: <20151215141640.GA25595@hmsreliant.think-freely.org> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 2015-12-15 09:16, Neil Horman: > 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) > Acked-by: Neil Horman Applied, thanks