Merge "build_tools/make_version: Get MAINLINE_BRANCH from .gitreview." into 16
This commit is contained in:
commit
393428be7b
|
@ -3,7 +3,6 @@
|
|||
AWK=${AWK:-awk}
|
||||
GIT=${GIT:-git}
|
||||
GREP=${GREP:-grep}
|
||||
MAINLINE_BRANCH=16
|
||||
|
||||
if [ -f ${1}/.version ]; then
|
||||
cat ${1}/.version
|
||||
|
@ -101,6 +100,7 @@ elif [ -d ${1}/.git ]; then
|
|||
MODIFIED=""
|
||||
SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
|
||||
if [ -z "$SVN_REV" ]; then
|
||||
MAINLINE_BRANCH=$(git config -f .gitreview --get gerrit.defaultbranch)
|
||||
VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
|
||||
if [ $? -ne 0 ]; then
|
||||
if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then
|
||||
|
|
Loading…
Reference in New Issue