diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-07 15:03:32 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-07 15:03:32 +0000 |
| commit | cec537db97a6e75f3485a8a8f3fbdf61190dc4f6 (patch) | |
| tree | 760a8a91f1c1346da8f97e6593c83fd3e659a849 /eclass | |
| parent | Sparc stable, bug #265308. (diff) | |
| download | gentoo-2-cec537db97a6e75f3485a8a8f3fbdf61190dc4f6.tar.gz gentoo-2-cec537db97a6e75f3485a8a8f3fbdf61190dc4f6.tar.bz2 gentoo-2-cec537db97a6e75f3485a8a8f3fbdf61190dc4f6.zip | |
Add working migration for shallow copy repositories. We cant keep it around showing errors.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/git.eclass | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/eclass/git.eclass b/eclass/git.eclass index 22d49ed040c8..37c8f49a8f53 100644 --- a/eclass/git.eclass +++ b/eclass/git.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.20 2009/04/07 14:39:32 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.21 2009/04/07 15:03:32 scarabeus Exp $ # @ECLASS: git.eclass # @MAINTAINER: @@ -46,7 +46,7 @@ EGIT_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/git-src" # @ECLASS-VARIABLE: EGIT_FETCH_CMD # @DESCRIPTION: # Command for cloning the repository. -EGIT_FETCH_CMD="git clone --bare" +: ${EGIT_FETCH_CMD:="git clone --bare"} # @ECLASS-VARIABLE: EGIT_UPDATE_CMD # @DESCRIPTION: @@ -144,7 +144,7 @@ git_fetch() { # If we have same branch and the tree we can do --depth 1 clone # which outputs into really smaller data transfers. - # Sadly we can do shallow copy for now because quite few packages need .git + # Sadly we can do shallow copy for now because quite a few packages need .git # folder. #[[ ${EGIT_TREE} = ${EGIT_BRANCH} ]] && \ # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1" @@ -183,6 +183,13 @@ git_fetch() { export GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" + # we also have to remove all shallow copied repositories + # and fetch them again + if [[ -e "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}/shallow" ]]; then + rm -rf "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" + einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching." + fi + if [[ ! -d ${EGIT_CLONE_DIR} ]] ; then # first clone ${elogcmd} "GIT NEW clone -->" @@ -223,7 +230,6 @@ git_fetch() { else ${elogcmd} " at the commit: ${cursha1}" fi - # piping through cat is needed to avoid a stupid Git feature ${EGIT_DIFFSTAT_CMD} ${oldsha1}..${EGIT_BRANCH} fi |