diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-03-03 21:45:06 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-03-03 21:45:06 +0000 |
| commit | 640c07a800c40c2e60680df59c4a51724afd698c (patch) | |
| tree | d3674fbdd818be7fd81005385458b24a212b0d62 /eclass | |
| parent | Version bump. (diff) | |
| download | historical-640c07a800c40c2e60680df59c4a51724afd698c.tar.gz historical-640c07a800c40c2e60680df59c4a51724afd698c.tar.bz2 historical-640c07a800c40c2e60680df59c4a51724afd698c.zip | |
Force EGIT_CLONE_TYPE=mirror for submodules since they can reference commits in any branch without explicitly naming the branch, bug #503332.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/git-r3.eclass | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index e24d698b290f..a172877bf3bf 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1164 2014/03/02 15:41:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1165 2014/03/03 21:45:06 mgorny Exp $ + + 03 Mar 2014; Michał Górny <mgorny@gentoo.org> git-r3.eclass: + Force EGIT_CLONE_TYPE=mirror for submodules since they can reference commits + in any branch without explicitly naming the branch, bug #503332. 02 Mar 2014; Michał Górny <mgorny@gentoo.org> xorg-2.eclass: Use git-r3 for live ebuilds. diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index b0c836071682..777ee505d79a 100644 --- a/eclass/git-r3.eclass +++ b/eclass/git-r3.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.38 2014/03/02 11:50:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.39 2014/03/03 21:45:06 mgorny Exp $ # @ECLASS: git-r3.eclass # @MAINTAINER: @@ -578,6 +578,10 @@ git-r3_fetch() { done [[ ${success} ]] || die "Unable to fetch from any of EGIT_REPO_URI" + # submodules can reference commits in any branch + # always use the 'clone' mode to accomodate that, bug #503332 + local EGIT_CLONE_TYPE=mirror + # recursively fetch submodules if git cat-file -e "${local_ref}":.gitmodules &>/dev/null; then local submodules |