diff options
| author | Paul Phillips <paulp@improving.org> | 2011-12-09 21:33:13 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-12 12:52:33 -0800 |
| commit | a348cc3f8310bee4b3053412106ecbc21718cc83 (patch) | |
| tree | 480b7a33e0dd7056956448248a9f98236a93815d | |
| parent | 7d2db571b41f3c23e91ad27ee5b81a421f312e00 (diff) | |
| download | scala-a348cc3f8310bee4b3053412106ecbc21718cc83.tar.gz scala-a348cc3f8310bee4b3053412106ecbc21718cc83.tar.bz2 scala-a348cc3f8310bee4b3053412106ecbc21718cc83.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.
| -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} |