Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Message-ID: <913802677.517121267078348068.JavaMail.jira@brutus.apache.org>
Date: Thu, 25 Feb 2010 06:12:28 +0000 (UTC)
From: "Jan Lehnardt (JIRA)" <jira@apache.org>
To: dev@couchdb.apache.org
Subject: [jira] Closed: (COUCHDB-670) bootstrap scripts makes assumptions
 about the git log format
In-Reply-To: <1850770140.516001267070428339.JavaMail.jira@brutus.apache.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit


     [ https://issues.apache.org/jira/browse/COUCHDB-670?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Jan Lehnardt closed COUCHDB-670.
--------------------------------

       Resolution: Fixed
    Fix Version/s: 0.11

Applied in trunk at r916144 and 0.11.x at r916146.

> 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
>            Assignee: Jan Lehnardt
>            Priority: Minor
>             Fix For: 0.11
>
>
> 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.