From c091f9f165da576bca9de415564f7cc8d009475c Mon Sep 17 00:00:00 2001 From: Jan Lehnardt Date: Thu, 25 Feb 2010 06:09:30 +0000 Subject: 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 --- THANKS | 1 + bootstrap | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 * Matt Goodall * Joel Clark + * Matt Lyon 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}"` -- cgit v1.2.3