<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9573">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">build_tools/make_version: Get MAINLINE_BRANCH from .gitreview.<br><br>Use .gitreview defaultbranch setting to determine the mainline branch.<br>This allows the script to be used against other directories which might<br>not be on the same defaultbranch.  This can be used by CI scripts to<br>report the testsuite version being used:<br>./build_tools/make_version ${TESTSUITE_DIR}<br><br>Change-Id: Ifdad4a9d8a26138c41bc6b630ecc3e34ea1c2758<br>---<br>M build_tools/make_version<br>1 file changed, 1 insertion(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/build_tools/make_version b/build_tools/make_version</span><br><span>index ce3bf6e..ad9fb3f 100755</span><br><span>--- a/build_tools/make_version</span><br><span>+++ b/build_tools/make_version</span><br><span>@@ -3,7 +3,6 @@</span><br><span> AWK=${AWK:-awk}</span><br><span> GIT=${GIT:-git}</span><br><span> GREP=${GREP:-grep}</span><br><span style="color: hsl(0, 100%, 40%);">-MAINLINE_BRANCH=master</span><br><span> </span><br><span> if [ -f ${1}/.version ]; then</span><br><span>     cat ${1}/.version</span><br><span>@@ -101,6 +100,7 @@</span><br><span>     MODIFIED=""</span><br><span>     SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`</span><br><span>     if [ -z "$SVN_REV" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+        MAINLINE_BRANCH=$(git config -f .gitreview --get gerrit.defaultbranch)</span><br><span>         VERSION=`${GIT} describe --long --always --tags --dirty=M 2> /dev/null`</span><br><span>         if [ $? -ne 0 ]; then</span><br><span>             if [ "`${GIT} ls-files -m | wc -l`" != "0" ]; then</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9573">change 9573</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/9573"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ifdad4a9d8a26138c41bc6b630ecc3e34ea1c2758 </div>
<div style="display:none"> Gerrit-Change-Number: 9573 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>