From 4fb5fbdced7faceaf4b24bd1b1f08cc127200ed8 Mon Sep 17 00:00:00 2001 From: John Stebbins Date: Thu, 27 Aug 2015 09:07:12 -0700 Subject: [PATCH] scripts: fix repo-info.sh It was not working for new tags made on master --- scripts/repo-info.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repo-info.sh b/scripts/repo-info.sh index 675a2cf620e6..0e402535d555 100755 --- a/scripts/repo-info.sh +++ b/scripts/repo-info.sh @@ -37,11 +37,11 @@ fi # Retrieve info URL=$(${GIT_EXE} config remote.origin.url) -TAG=$(${GIT_EXE} describe --abbrev=0) +TAG=$(${GIT_EXE} describe --tags --abbrev=0) if [[ ${TAG} ]]; then REV=$(${GIT_EXE} rev-list ${TAG}.. --count) else - TAG=$(${GIT_EXE} describe $(${GIT_EXE} rev-list --tags --max-count=1)) + TAG=$(${GIT_EXE} describe --tags $(${GIT_EXE} rev-list --tags --max-count=1)) if [[ ${TAG} ]]; then REV=$(${GIT_EXE} rev-list $(${GIT_EXE} merge-base ${TAG} HEAD).. --count) else