From dev-return-8827-apmail-couchdb-dev-archive=couchdb.apache.org@couchdb.apache.org Thu Feb 25 04:00:51 2010 Return-Path: Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: (qmail 21417 invoked from network); 25 Feb 2010 04:00:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 25 Feb 2010 04:00:51 -0000 Received: (qmail 51819 invoked by uid 500); 25 Feb 2010 04:00:51 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 51777 invoked by uid 500); 25 Feb 2010 04:00:51 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 51769 invoked by uid 99); 25 Feb 2010 04:00:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2010 04:00:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.140] (HELO brutus.apache.org) (140.211.11.140) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Feb 2010 04:00:49 +0000 Received: from brutus.apache.org (localhost [127.0.0.1]) by brutus.apache.org (Postfix) with ESMTP id 533A0234C052 for ; Wed, 24 Feb 2010 20:00:28 -0800 (PST) Message-ID: <1850770140.516001267070428339.JavaMail.jira@brutus.apache.org> Date: Thu, 25 Feb 2010 04:00:28 +0000 (UTC) From: "Matt Lyon (JIRA)" To: dev@couchdb.apache.org Subject: [jira] Created: (COUCHDB-670) bootstrap scripts makes assumptions about the git log format MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 X-Virus-Checked: Checked by ClamAV on apache.org bootstrap scripts makes assumptions about the git log format ------------------------------------------------------------ Key: COUCHDB-670 URL: https://issues.apache.org/jira/browse/COUCHDB-670 Project: CouchDB Issue Type: Bug Components: Build System Environment: scm: git, when .gitconfig alters the log format Reporter: Matt Lyon Priority: Minor my .gitconfig uses sets up the log format like so: [format] pretty="format:%C(yellow)%h%Creset %C(magenta bold)%aN%Creset%C(blue) %ad%Creset %s" and the bootstrap script interprets a color code as the version number. instead, this patch will use an explicit format to get JUST the version number: diff --git a/bootstrap b/bootstrap index 8cfc2c0..aa4d9e7 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}"` -- This message is automatically generated by JIRA. - You can reply to this email to add a comment to the issue online.