Revert "build: do not enter 20.7.r description territory on 20.1"

This reverts commit 84e5ec467a.
core doesn't actually use "git_describe" so we are fine here.
Added a similar commit in the core repository that actually works. ;)
This commit is contained in:
Franco Fichtner 2020-07-23 12:30:09 +02:00
parent 35d1e1138f
commit db2421cfb3
1 changed files with 1 additions and 6 deletions

View File

@ -340,13 +340,8 @@ git_pull()
git_describe()
{
HEAD=${2:-"HEAD"}
VERSIONARGS="--abbrev=0 --always"
if [ "${PRODUCT_SETTINGS}" = "20.1" ]; then
VERSIONARGS="${VERSIONARGS} --exclude=20.7.r*"
fi
VERSION=$(git -C ${1} describe ${VERSIONARGS} ${HEAD})
VERSION=$(git -C ${1} describe --abbrev=0 --always ${HEAD})
REVISION=$(git -C ${1} rev-list --count ${VERSION}..${HEAD})
COMMENT=$(git -C ${1} rev-list --max-count=1 ${HEAD} | cut -c1-9)
BRANCH=$(git -C ${1} rev-parse --abbrev-ref ${HEAD})