Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: git-2.eclass
Date: Mon, 02 May 2011 21:15:52
Message-Id: 20110502211530.5790920054@flycatcher.gentoo.org
1 mgorny 11/05/02 21:15:30
2
3 Modified: git-2.eclass
4 Log:
5 Fix variable references ({cur,old}sha1 -> {cur,old}sha).
6
7 Revision Changes Path
8 1.5 eclass/git-2.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-2.eclass?rev=1.5&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-2.eclass?rev=1.5&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-2.eclass?r1=1.4&r2=1.5
13
14 Index: git-2.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v
17 retrieving revision 1.4
18 retrieving revision 1.5
19 diff -u -r1.4 -r1.5
20 --- git-2.eclass 24 Apr 2011 15:33:56 -0000 1.4
21 +++ git-2.eclass 2 May 2011 21:15:30 -0000 1.5
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2011 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.4 2011/04/24 15:33:56 scarabeus Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.5 2011/05/02 21:15:30 mgorny Exp $
27
28 # @ECLASS: git-2.eclass
29 # @MAINTAINER:
30 @@ -358,7 +358,7 @@
31 echo "GIT update -->"
32 echo " repository: ${EGIT_REPO_URI_SELECTED}"
33 # write out message based on the revisions
34 - if [[ "${oldsha1}" != "${cursha1}" ]]; then
35 + if [[ "${oldsha}" != "${cursha}" ]]; then
36 echo " updating from commit: ${oldsha}"
37 echo " to commit: ${cursha}"
38 else
39 @@ -370,7 +370,7 @@
40 popd > /dev/null
41 fi
42 # export the version the repository is at
43 - export EGIT_VERSION="${cursha1}"
44 + export EGIT_VERSION="${cursha}"
45 # log the repo state
46 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] \
47 && echo " commit: ${EGIT_COMMIT}"