From 340bb43e884319824c9f9c6234f0a17fd3b1bfe3 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Mon, 5 Dec 2011 07:12:31 -0800 Subject: Tweaks to get-scala-revision. Reference to git head is supposed to be HEAD, not head. Also apparently [[ ]] is a bashism so it's [ ]. Made name generation robust against the absence of the dev tag; it will generate a similar name even if it's not there, minus the part it can't determine without it. --- tools/get-scala-revision | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'tools/get-scala-revision') diff --git a/tools/get-scala-revision b/tools/get-scala-revision index 23b216aa2b..e8597844cc 100755 --- a/tools/get-scala-revision +++ b/tools/get-scala-revision @@ -5,8 +5,15 @@ # # If no dir is given, current working dir is used. -[[ -n "$1" ]] && cd "$1" +[ -n "$1" ] && cd "$1" # dev should be a tag at the merge-base of master and the # most recent release. -git describe head --abbrev=7 --match dev +if [ -z $(git tag -l dev) ]; then + # no dev tag available - this will generate dev-g + echo "dev-g$(git describe HEAD --abbrev=7 --always)" +else + # dev tag exists - this generates dev-NNNN-g + # where NNNN is the number of commits since dev. + git describe HEAD --abbrev=7 --match dev +fi -- cgit v1.2.3