summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-12-09 21:33:13 -0800
committerPaul Phillips <paulp@improving.org>2011-12-09 21:33:13 -0800
commit92e0e57a054c7ab6a59249214be253d0f2f85477 (patch)
treed7a519a007d6f94a3c8b85439cb84cef87ffcf9c /tools
parenteaa37158ccb6455d55ea7499e3f8e8d8ccc6703d (diff)
downloadscala-92e0e57a054c7ab6a59249214be253d0f2f85477.tar.gz
scala-92e0e57a054c7ab6a59249214be253d0f2f85477.tar.bz2
scala-92e0e57a054c7ab6a59249214be253d0f2f85477.zip
More on get-scala-revision.
Now that I've resorted to building git 1.5.4, I can stop trying to reverse engineer it through jenkins. This implementation feels winnerish.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/get-scala-revision6
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}