Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9AE35EFD7 for ; Wed, 30 Jan 2013 12:19:07 +0000 (UTC) Received: (qmail 55883 invoked by uid 500); 30 Jan 2013 12:19:05 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 55480 invoked by uid 500); 30 Jan 2013 12:19:00 -0000 Mailing-List: contact commits-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 commits@couchdb.apache.org Received: (qmail 55450 invoked by uid 99); 30 Jan 2013 12:18:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Jan 2013 12:18:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4D78C827665; Wed, 30 Jan 2013 12:18:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jhs@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Support any type of Git checkout (cloned, or submodule) Message-Id: <20130130121859.4D78C827665@tyr.zones.apache.org> Date: Wed, 30 Jan 2013 12:18:59 +0000 (UTC) Updated Branches: refs/heads/1.3.x 9e8782fa1 -> 1e291e597 Support any type of Git checkout (cloned, or submodule) Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1e291e59 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1e291e59 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1e291e59 Branch: refs/heads/1.3.x Commit: 1e291e597da3c80e80582b67c8a7db82e269cb79 Parents: 9e8782f Author: Jason Smith (work) Authored: Wed Jan 30 12:17:06 2013 +0000 Committer: Jason Smith (work) Committed: Wed Jan 30 12:17:06 2013 +0000 ---------------------------------------------------------------------- bootstrap | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/1e291e59/bootstrap ---------------------------------------------------------------------- diff --git a/bootstrap b/bootstrap index 1e5bdf1..021275b 100755 --- a/bootstrap +++ b/bootstrap @@ -32,7 +32,7 @@ get () { } if test -z "$REVISION"; then - if test -d .git; then + if test -e .git; then REVISION=`git describe --always`-git fi fi @@ -43,7 +43,7 @@ else sed "s/%release%/$REVISION/" < acinclude.m4.in > acinclude.m4 fi -if test -d .git; then +if test -e .git; then OS=`uname -s` case "$OS" in Linux|CYGWIN*) # GNU sed