From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 356511381FA for ; Tue, 20 May 2014 06:53:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB8EDE09B3; Tue, 20 May 2014 06:53:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46236E09B3 for ; Tue, 20 May 2014 06:53:51 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 535BD33FF17 for ; Tue, 20 May 2014 06:53:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id ECAED1818D for ; Tue, 20 May 2014 06:53:48 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1400568724.b5d07a665842fdab5865ce1620f0ddb7cc48d067.ulm@gentoo> Subject: [gentoo-commits] proj/eselect:master commit in: / X-VCS-Repository: proj/eselect X-VCS-Files: ChangeLog configure.ac X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: b5d07a665842fdab5865ce1620f0ddb7cc48d067 X-VCS-Branch: master Date: Tue, 20 May 2014 06:53:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5bbb02d3-42a4-4289-a8a2-74674d458a44 X-Archives-Hash: 1319681215e8ef27039a8bee06533b09 commit: b5d07a665842fdab5865ce1620f0ddb7cc48d067 Author: Ulrich Müller gentoo org> AuthorDate: Tue May 20 06:52:04 2014 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Tue May 20 06:52:04 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=b5d07a66 Use "git describe" in configure. * configure.ac: Replace "git rev-parse" by "git describe", now that git-r3.eclass supports it (bug 489100). --- ChangeLog | 5 +++++ configure.ac | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 143edc8..d5ddaef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-05-20 Ulrich Müller + + * configure.ac: Replace "git rev-parse" by "git describe", now + that git-r3.eclass supports it (bug 489100). + 2014-03-20 Ulrich Müller * doc/user-guide.txt: Mention the "unset" action also here. diff --git a/configure.ac b/configure.ac index 6379db0..63081e7 100644 --- a/configure.ac +++ b/configure.ac @@ -78,11 +78,11 @@ AC_SUBST(EPREFIX) AC_MSG_CHECKING([whether building from git]) EXTRAVERSION="" if test -d ${GIT_DIR:-.git}; then - GITREV=`git rev-parse --short HEAD` - if test x$GITREV != x; then - EXTRAVERSION="-git-$GITREV" + COMMIT=`git describe --always HEAD` + if test x$COMMIT != x; then + EXTRAVERSION=" (commit $COMMIT)" fi - AC_MSG_RESULT([yes${GITREV:+, at revision $GITREV}]) + AC_MSG_RESULT([yes$EXTRAVERSION]) else AC_MSG_RESULT(no) fi