From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 15 Dec 2015 13:55:15 +0000 (+0200)
Subject: scripts: fix ABI validator when revision is a tag
X-Git-Tag: spdx-start~7712
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=ece9c50d400f724fd307424b889f9d637baec858;p=dpdk.git

scripts: fix ABI validator when revision is a tag

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 <pmatilai@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
---

diff --git a/scripts/validate-abi.sh b/scripts/validate-abi.sh
index 8d7be24290..c36ad61df6 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)