From ece9c50d400f724fd307424b889f9d637baec858 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 15 Dec 2015 15:55:15 +0200 Subject: [PATCH] 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 Acked-by: Neil Horman --- 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 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) -- 2.20.1