From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D5FFB11A2 for ; Tue, 15 Dec 2015 14:55:23 +0100 (CET) Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 3AA6EC0C7CB8; Tue, 15 Dec 2015 13:55:23 +0000 (UTC) Received: from sopuli.koti.laiskiainen.org.com (vpn1-5-21.ams2.redhat.com [10.36.5.21]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tBFDtKCg029387; Tue, 15 Dec 2015 08:55:21 -0500 From: Panu Matilainen To: dev@dpdk.org Date: Tue, 15 Dec 2015 15:55:15 +0200 Message-Id: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Subject: [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 13:55:24 -0000 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