diff options
| author | Paul Phillips <paulp@improving.org> | 2011-12-12 12:52:51 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-12 12:52:51 -0800 |
| commit | ce547906aea7c085a71fa5c718cc5138fd439e68 (patch) | |
| tree | 5fdf1a111d494db839d2b47e42e31b617c80612b | |
| parent | b07fa6bcc4ffe657c28fb43449bf947c4ffe752b (diff) | |
| parent | a348cc3f8310bee4b3053412106ecbc21718cc83 (diff) | |
| download | scala-ce547906aea7c085a71fa5c718cc5138fd439e68.tar.gz scala-ce547906aea7c085a71fa5c718cc5138fd439e68.tar.bz2 scala-ce547906aea7c085a71fa5c718cc5138fd439e68.zip | |
Merge branch 'dec10-version-string' into 2.8.x
| -rwxr-xr-x | tools/get-scala-revision | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/get-scala-revision b/tools/get-scala-revision index dc0ee561dd..3977a61040 100755 --- a/tools/get-scala-revision +++ b/tools/get-scala-revision @@ -17,6 +17,6 @@ devbase="d6f3184fc8" # where NNNN is the number of commits since devbase, which # is the merge-base of the most recent release and master. # Presently hardcoded to reduce uncertainty, v2.9.1/master. -commits=$(GIT_PAGER=cat git log --oneline $devbase..HEAD | wc -l) -sha=$(git log -1 --abbrev-commit --abbrev=7 --format="%h") -printf "dev-%s-g%s\n" $commits $sha +commits=$(git --no-pager log --pretty=oneline $devbase..HEAD | wc -l) +sha=$(git rev-list -n 1 HEAD) +printf "dev-%s-g%s\n" $commits ${sha:0:7} |