diff options
| author | Paul Phillips <paulp@improving.org> | 2011-12-05 07:12:31 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-05 07:18:37 -0800 |
| commit | 340bb43e884319824c9f9c6234f0a17fd3b1bfe3 (patch) | |
| tree | 5f175573fbbf1d449649cdcd575823ee21247faa /tools | |
| parent | a289465c70630719cbd3a74edf5502a156ef83c4 (diff) | |
| download | scala-340bb43e884319824c9f9c6234f0a17fd3b1bfe3.tar.gz scala-340bb43e884319824c9f9c6234f0a17fd3b1bfe3.tar.bz2 scala-340bb43e884319824c9f9c6234f0a17fd3b1bfe3.zip | |
Tweaks to get-scala-revision.
Reference to git head is supposed to be HEAD, not head.
Also apparently [[ <test> ]] is a bashism so it's [ <test> ].
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.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/get-scala-revision | 11 | ||||
| -rw-r--r-- | tools/get-scala-revision.bat | 2 |
2 files changed, 10 insertions, 3 deletions
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<sha> + echo "dev-g$(git describe HEAD --abbrev=7 --always)" +else + # dev tag exists - this generates dev-NNNN-g<sha> + # where NNNN is the number of commits since dev. + git describe HEAD --abbrev=7 --match dev +fi diff --git a/tools/get-scala-revision.bat b/tools/get-scala-revision.bat index ed3ade8a3e..1c2403da89 100644 --- a/tools/get-scala-revision.bat +++ b/tools/get-scala-revision.bat @@ -15,7 +15,7 @@ if "%*"=="" ( cd %_DIR% if exist .git\NUL ( - git describe head --abbrev=7 --match dev + git describe HEAD --abbrev=7 --match dev echo 0 ) |