Commit 8c827385 authored by James Zern's avatar James Zern

Revert "build/make/version.sh: Fix read of git hash when there are no tags."

This reverts commit 872c31d4.

Depending on the short commit hash (one that starts with a digit) this
will set major/minor/patch to the same value which will be used by
aom_codec_version() resulting in a warning due to the version number
exceeding 32-bits.

BUG=https://bugs.chromium.org/p/aomedia/issues/detail?id=4

Change-Id: I18751004f8436a1d3e31aaf5683fbc7d63825a6a
parent 4ceb066d
......@@ -25,12 +25,7 @@ git_version_id=""
if [ -d "${source_path}/.git" ]; then
# Source Path is a git working copy. Check for local modifications.
export GIT_DIR="${source_path}/.git"
git_tags=`git tag -l 'v[0-9]*'`
if [ -n "${git_tags}" ]; then
git_version_id=`git describe --match=v[0-9]* 2>/dev/null`
else
git_version_id=`git rev-parse --short HEAD`
fi
git_version_id=`git describe --match=v[0-9]* 2>/dev/null`
fi
changelog_version=""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment