/[gentoo-x86]/eclass/git.eclass
Gentoo

Diff of /eclass/git.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.38 Revision 1.39
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2009 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/git.eclass,v 1.38 2010/01/23 15:46:50 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/git.eclass,v 1.39 2010/01/25 17:15:18 scarabeus Exp $
4 4
5# @ECLASS: git.eclass 5# @ECLASS: git.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Tomas Chvatal <scarabeus@gentoo.org> 7# Tomas Chvatal <scarabeus@gentoo.org>
8# Donnie Berkholz <dberkholz@gentoo.org> 8# Donnie Berkholz <dberkholz@gentoo.org>
280 oldsha1=$(git rev-parse origin/${EGIT_BRANCH}) 280 oldsha1=$(git rev-parse origin/${EGIT_BRANCH})
281 281
282 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}" 282 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}"
283 # fix branching 283 # fix branching
284 git checkout ${EGIT_MASTER} 284 git checkout ${EGIT_MASTER}
285 for x in $(git branch |grep -v "* master" |tr '\n' ' '); do 285 for x in $(git branch |grep -v "* ${EGIT_MASTER}" |tr '\n' ' '); do
286 git branch -D ${x} 286 git branch -D ${x}
287 done 287 done
288 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \ 288 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \
289 || die "${EGIT}: can't update from ${EGIT_REPO_URI}." 289 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
290 290

Legend:
Removed from v.1.38  
changed lines
  Added in v.1.39

  ViewVC Help
Powered by ViewVC 1.1.20