Repository: incubator-trafficcontrol Updated Branches: refs/heads/1.8.x 9cbd3d373 -> bb04cdc38
revcount and commit from buildno (cherry picked from commit c2564669f3e206d88959fabb7338352b67e25aa7) Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/735d34d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/735d34d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/735d34d8 Branch: refs/heads/1.8.x Commit: 735d34d8fe8bdf5dfa57244d01fbd93f3d88c500 Parents: 9cbd3d3 Author: Dan Kirkwood <dang...@gmail.com> Authored: Sat Nov 12 19:00:25 2016 -0700 Committer: Dan Kirkwood <dang...@gmail.com> Committed: Mon Nov 28 10:12:16 2016 -0700 ---------------------------------------------------------------------- build/functions.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/735d34d8/build/functions.sh ---------------------------------------------------------------------- diff --git a/build/functions.sh b/build/functions.sh index bb63530..c9dba30 100755 --- a/build/functions.sh +++ b/build/functions.sh @@ -44,7 +44,8 @@ function versionOk() { # --------------------------------------- function getRevCount() { - git rev-list HEAD 2>/dev/null | wc -l + local buildNum=$(getBuildNumber) + echo ${buildNum%.*} } # --------------------------------------- @@ -54,9 +55,9 @@ function isInGitTree() { # --------------------------------------- function getBuildNumber() { - local in_git=$(isInGitTree) - if [[ $in_git ]]; then - local commits=$(getRevCount) + local in_git=$() + if isInGitTree; then + local commits=$(git rev-list HEAD 2>/dev/null | wc -l) local sha=$(git rev-parse --short=8 HEAD) echo "$commits.$sha" else @@ -80,7 +81,8 @@ function getRhelVersion { # --------------------------------------- function getCommit() { - git rev-parse HEAD + local buildNum=$(getBuildNumber) + echo ${buildNum%.*} } # ---------------------------------------
