<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Dec 20, 2017 at 2:44 AM, Tzafrir Cohen <span dir="ltr"><<a href="mailto:tzafrir.cohen@xorcom.com" target="_blank">tzafrir.cohen@xorcom.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Off-topic:<br>
<br>
On Tue, Dec 19, 2017 at 01:50:03PM -0700, George Joseph wrote:<br>
<br>
> Thankfully we tag EVERYTHING! :)<br>
<br>
asterisk(13)$ git describe<br>
13.15.0-rc1-908-ge31e3b581b<br>
<br>
asterisk(14)$ git describe<br>
fatal: No tags can describe '<wbr>fb18797ae09a685ec71101499fb1c1<wbr>c606b16397'.<br>
Try --always, or create some tags.<br>
<br>
asterisk(15)$ git describe<br>
fatal: No tags can describe '<wbr>d312068ee93ff8ce97b464f3c2ff33<wbr>04e15cb3fe'.<br>
Try --always, or create some tags.<br>
<br>
<br>
I wasted half an hour yesterday trying to find out why a build sis not<br>
switch from master to 13, only to realize that the name of the git<br>
branch in the version string is always "master".<br>
<br>
We tag everything. But only well after it was branched from the main<br></blockquote><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">branch.<br></blockquote><div><br></div><div>I'm not following you.</div><div><br></div><div>We tag every release...</div><div><br></div><div>$ git checkout 13.18.4</div><div>HEAD is now at f4644317b7... Update for 13.18.4</div><div>$ git describe</div><div>13.18.4</div><div>$ commit f4644317b7dd1963c92dc13295027cdfbb4fbc5e (HEAD, tag: 13.18.4, gerrit/13.18, 13.18)</div><div>Author: George Joseph <<a href="mailto:gjoseph@digium.com">gjoseph@digium.com</a>></div><div>Date: Wed Dec 13 09:33:48 2017 -0500</div><div><br></div><div> Update for 13.18.4</div><div><br></div><div>commit 8052b5d76ed5d2b16436335c67877c1a09012c3c</div><div>$</div><div><br></div><div>The commit that's tagged is the one that has all the housekeeping (ChangeLog, summaries, .version) for the release so that commit will never be in the main branches. It will be in the release branches however...</div><div><br></div><div>$ git checkout 13.18</div><div><div>Switched to branch '13.18'</div><div>Your branch is up-to-date with 'gerrit/13.18'.</div><div>$ git describe</div><div>13.18.4</div><div>$ </div></div><div><br></div><div>We have to create the minor release branch (13.18) and do the work there so that patch releases (13.18.4) are based on the minor release branch, not the major branch. </div><div><br></div><div><br></div><div><br></div><div><br></div><div><br></div><div><br></div><div><br></div><div><br></div><div><br></div><div><br></div><div><br></div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<span class="gmail-HOEnZb"><font color="#888888"><br>
--<br>
Tzafrir Cohen<br>
+972-50-7952406 mailto:<a href="mailto:tzafrir.cohen@xorcom.com">tzafrir.cohen@xorcom.<wbr>com</a><br>
<a href="http://www.xorcom.com" rel="noreferrer" target="_blank">http://www.xorcom.com</a><br>
<br>
--<br>
______________________________<wbr>______________________________<wbr>_________<br>
-- Bandwidth and Colocation Provided by <a href="http://www.api-digital.com" rel="noreferrer" target="_blank">http://www.api-digital.com</a> --<br>
<br>
asterisk-dev mailing list<br>
To UNSUBSCRIBE or update options visit:<br>
<a href="http://lists.digium.com/mailman/listinfo/asterisk-dev" rel="noreferrer" target="_blank">http://lists.digium.com/<wbr>mailman/listinfo/asterisk-dev</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr"><span style="font-size:12.8px">George Joseph</span><br style="font-size:12.8px"><span style="font-size:12.8px">Digium, Inc. | Software Developer</span><span style="font-size:12.8px"><br>445 Jan Davis Drive NW - Huntsville, AL 35806 - US<br></span><span style="font-size:12.8px">Check us out at: </span><a href="http://www.digium.com/" rel="noreferrer" style="color:rgb(17,85,204);font-size:12.8px" target="_blank">www.digium.com</a><span style="font-size:12.8px"> & </span><a href="http://www.asterisk.org/" rel="noreferrer" style="color:rgb(17,85,204);font-size:12.8px" target="_blank">www.asterisk.org</a><br><div><br></div></div></div>
</div></div>