svn commit: r916144 - in /couchdb/trunk: THANKS bootstrap

[ja...@apache.org]

Author: jan
Date: Thu Feb 25 06:09:30 2010
New Revision: 916144

URL: http://svn.apache.org/viewvc?rev=916144&view=rev
Log:
Do not rely on specific format of `git log`. Closes COUCHDB-670. Patch by Matt Lyon.

Modified:
    couchdb/trunk/THANKS
    couchdb/trunk/bootstrap

Modified: couchdb/trunk/THANKS
URL: http://svn.apache.org/viewvc/couchdb/trunk/THANKS?rev=916144&r1=916143&r2=916144&view=diff
==============================================================================
--- couchdb/trunk/THANKS (original)
+++ couchdb/trunk/THANKS Thu Feb 25 06:09:30 2010
@@ -48,5 +48,6 @@
  * James Marca <jm...@translab.its.uci.edu>
  * Matt Goodall <ma...@gmail.com>
  * Joel Clark <un...@yahoo.com>
+ * Matt Lyon <ma...@flowerpowered.com>
 
 For a list of authors see the `AUTHORS` file.

Modified: couchdb/trunk/bootstrap
URL: http://svn.apache.org/viewvc/couchdb/trunk/bootstrap?rev=916144&r1=916143&r2=916144&view=diff
==============================================================================
--- couchdb/trunk/bootstrap (original)
+++ couchdb/trunk/bootstrap Thu Feb 25 06:09:30 2010
@@ -33,7 +33,7 @@
 
 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}"`