diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-03-02 11:49:49 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-03-02 11:49:49 +0000 |
| commit | 95fe36bf2b3fc6ab3110ac77e1a0f71d9dc97bcb (patch) | |
| tree | cd1df9538829d703fbf6227630e6c84118943c17 /eclass | |
| parent | ia64 stable wrt bug #502802 (diff) | |
| download | gentoo-2-95fe36bf2b3fc6ab3110ac77e1a0f71d9dc97bcb.tar.gz gentoo-2-95fe36bf2b3fc6ab3110ac77e1a0f71d9dc97bcb.tar.bz2 gentoo-2-95fe36bf2b3fc6ab3110ac77e1a0f71d9dc97bcb.zip | |
Force non-forward updates on git refs.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/git-r3.eclass | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 1fc8712c2239..5241e5d76ec9 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1160 2014/03/02 11:49:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1161 2014/03/02 11:49:49 mgorny Exp $ + + 02 Mar 2014; Michał Górny <mgorny@gentoo.org> git-r3.eclass: + Force non-forward updates on git refs. 02 Mar 2014; Michał Górny <mgorny@gentoo.org> git-r3.eclass: Add EGIT_MIN_CLONE_TYPE to control clone type via ebuilds. diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index 5002b3497023..a254902ec9d1 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.35 2014/03/02 11:49:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.36 2014/03/02 11:49:49 mgorny Exp $ # @ECLASS: git-r3.eclass # @MAINTAINER: @@ -452,14 +452,14 @@ git-r3_fetch() { fetch_command+=( --prune # mirror the remote branches as local branches - "refs/heads/*:refs/heads/*" + "+refs/heads/*:refs/heads/*" # pull tags explicitly in order to prune them properly - "refs/tags/*:refs/tags/*" + "+refs/tags/*:refs/tags/*" # notes in case something needs them - "refs/notes/*:refs/notes/*" + "+refs/notes/*:refs/notes/*" # and HEAD in case we need the default branch # (we keep it in refs/git-r3 since otherwise --prune interferes) - HEAD:refs/git-r3/HEAD + "+HEAD:refs/git-r3/HEAD" ) else # single or shallow local fetch_l fetch_r @@ -502,7 +502,7 @@ git-r3_fetch() { fi fetch_command+=( - "${fetch_l}:${fetch_r}" + "+${fetch_l}:${fetch_r}" ) fi |