summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-01-13 20:04:19 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-01-13 20:04:19 +0000
commitf49341ac85cbaa77e95bed340b789a86b986ef19 (patch)
tree173224e610b0d17a4f4b1cd8d167bc6cb067b8dd /eclass
parentMarked ~sparc-solaris, ~sparc64-solaris, bug #300813 (diff)
downloadgentoo-2-f49341ac85cbaa77e95bed340b789a86b986ef19.tar.gz
gentoo-2-f49341ac85cbaa77e95bed340b789a86b986ef19.tar.bz2
gentoo-2-f49341ac85cbaa77e95bed340b789a86b986ef19.zip
Revert back to safe values so it does not break stable.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/git.eclass13
1 files changed, 5 insertions, 8 deletions
diff --git a/eclass/git.eclass b/eclass/git.eclass
index 59375b6ec058..17c82b21e760 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.34 2010/01/13 09:51:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.35 2010/01/13 20:04:19 scarabeus Exp $
# @ECLASS: git.eclass
# @MAINTAINER:
@@ -52,7 +52,7 @@ DEPEND=">=dev-util/git-1.6"
# @ECLASS-VARIABLE: EGIT_UPDATE_CMD
# @DESCRIPTION:
# Git fetch command.
-EGIT_UPDATE_CMD="git pull -f -u --all"
+EGIT_UPDATE_CMD="git pull -f -u"
# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD
# @DESCRIPTION:
@@ -301,12 +301,10 @@ git_fetch() {
${elogcmd} " branch: ${EGIT_BRANCH}"
${elogcmd} " storage directory: \"${GIT_DIR}\""
- popd &> /dev/null
-
# unpack to the ${S}
- # "${EGIT_REPO_URI}"
- debug-print "git clone -l -s -n \"${GIT_DIR}\" \"${S}\""
- git clone -l -s -n "${GIT_DIR}" "${S}"
+ popd &> /dev/null
+ debug-print "git clone -l \"${GIT_DIR}\" \"${S}\""
+ git clone -l "${GIT_DIR}" "${S}"
# set correct branch and the tree ebuild specified
pushd "${S}" > /dev/null
@@ -317,7 +315,6 @@ git_fetch() {
fi
debug-print "git checkout -b ${branchname} ${src}"
git checkout -b ${branchname} ${src} 2>&1 > /dev/null
-
git_sumbodules
popd > /dev/null