kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "build_tools/make_version: Get MAINLINE_BRANCH from .gitreview." into 16

Browse Source
This commit is contained in:
George Joseph
2018-07-24 05:40:41 -05:00
committed by Gerrit Code Review
parent 35d06e46ae 9b3267641f
commit 393428be7b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_tools/make_version
View File

@@ -3,7 +3,6 @@
AWK=${AWK:-awk} AWK=${AWK:-awk}
GIT=${GIT:-git} GIT=${GIT:-git}
GREP=${GREP:-grep} GREP=${GREP:-grep}
MAINLINE_BRANCH=16
if [ -f ${1}/.version ]; then if [ -f ${1}/.version ]; then
cat ${1}/.version cat ${1}/.version
@@ -101,6 +100,7 @@ elif [ -d ${1}/.git ]; then
MODIFIED="" MODIFIED=""
SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"` SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
if [ -z "$SVN_REV" ]; then 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` VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then