summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2010-02-25 06:09:30 +0000
committerJan Lehnardt <jan@apache.org>2010-02-25 06:09:30 +0000
commitc091f9f165da576bca9de415564f7cc8d009475c (patch)
tree4956e5a5622c09b44efe4cb25765a9507cb76521
parent16577da96d0cb43b7733a3a04c21aa9ac72bdb64 (diff)
Do not rely on specific format of `git log`. Closes COUCHDB-670. Patch by Matt Lyon.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@916144 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--THANKS1
-rwxr-xr-xbootstrap2
2 files changed, 2 insertions, 1 deletions
diff --git a/THANKS b/THANKS
index 903a728c..790c064e 100644
--- a/THANKS
+++ b/THANKS
@@ -48,5 +48,6 @@ suggesting improvements or submitting changes. Some of these people are:
* James Marca <jmarca@translab.its.uci.edu>
* Matt Goodall <matt.goodall@gmail.com>
* Joel Clark <unsigned_char@yahoo.com>
+ * Matt Lyon <matt@flowerpowered.com>
For a list of authors see the `AUTHORS` file.
diff --git a/bootstrap b/bootstrap
index 8cfc2c01..aa4d9e78 100755
--- a/bootstrap
+++ b/bootstrap
@@ -33,7 +33,7 @@ mkdir -p build-aux
if test -z "$REVISION"; then
if test -d .git; then
- REVISION=`git log | head -1 | awk '{print $2}' | cut -b 1-8`-git
+ REVISION=`git log --pretty="format:%h" | head -1`-git
else
# default to svn
REVISION=`\`which svn\` info . 2> /dev/null | awk "/Revision:/{print \\$2}"`