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: ChangeLog git-r3.eclass
Date: Sun, 27 Oct 2013 13:44:42
Message-Id: 20131027134435.4F1B520047@flycatcher.gentoo.org
1 mgorny 13/10/27 13:44:35
2
3 Modified: ChangeLog git-r3.eclass
4 Log:
5 Create a fake ".git" directory inside the checkout to satisfy git rev-parse uses in build systems. Bug #489100.
6
7 Revision Changes Path
8 1.1039 eclass/ChangeLog
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1039&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1039&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1038&r2=1.1039
13
14 Index: ChangeLog
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
17 retrieving revision 1.1038
18 retrieving revision 1.1039
19 diff -u -r1.1038 -r1.1039
20 --- ChangeLog 27 Oct 2013 13:33:44 -0000 1.1038
21 +++ ChangeLog 27 Oct 2013 13:44:35 -0000 1.1039
22 @@ -1,6 +1,10 @@
23 # ChangeLog for eclass directory
24 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1038 2013/10/27 13:33:44 mgorny Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1039 2013/10/27 13:44:35 mgorny Exp $
27 +
28 + 27 Oct 2013; Michał Górny <mgorny@g.o> git-r3.eclass:
29 + Create a fake ".git" directory inside the checkout to satisfy git rev-parse
30 + uses in build systems. Bug #489100.
31
32 27 Oct 2013; Michał Górny <mgorny@g.o> git-r3.eclass:
33 Strip sub-slot from local repo IDs.
34
35
36
37 1.21 eclass/git-r3.eclass
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.21&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.21&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.20&r2=1.21
42
43 Index: git-r3.eclass
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
46 retrieving revision 1.20
47 retrieving revision 1.21
48 diff -u -r1.20 -r1.21
49 --- git-r3.eclass 27 Oct 2013 13:33:44 -0000 1.20
50 +++ git-r3.eclass 27 Oct 2013 13:44:35 -0000 1.21
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2013 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.20 2013/10/27 13:33:44 mgorny Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.21 2013/10/27 13:44:35 mgorny Exp $
56
57 # @ECLASS: git-r3.eclass
58 # @MAINTAINER:
59 @@ -634,6 +634,11 @@
60 # keep this *after* submodules
61 export EGIT_DIR=${GIT_DIR}
62 export EGIT_VERSION=${new_commit_id}
63 +
64 + # create a fake '.git' directory to satisfy 'git rev-parse HEAD'
65 + GIT_DIR=${GIT_WORK_TREE}/.git
66 + git init || die
67 + echo "${EGIT_VERSION}" > "${GIT_WORK_TREE}"/.git/HEAD || die
68 }
69
70 # @FUNCTION: git-r3_peek_remote_ref