diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-25 17:15:18 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-25 17:15:18 +0000 |
| commit | 340c3090b380ac16ec5471e5b2e7dcf90c4b918f (patch) | |
| tree | efd7aa4220d222c16985a40053bc7dcbe9435f28 /eclass/git.eclass | |
| parent | Version bump KDE 4.3.5 (diff) | |
| download | gentoo-2-340c3090b380ac16ec5471e5b2e7dcf90c4b918f.tar.gz gentoo-2-340c3090b380ac16ec5471e5b2e7dcf90c4b918f.tar.bz2 gentoo-2-340c3090b380ac16ec5471e5b2e7dcf90c4b918f.zip | |
Fix non-master master breakage with deleting own branch.
Diffstat (limited to 'eclass/git.eclass')
| -rw-r--r-- | eclass/git.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/git.eclass b/eclass/git.eclass index 25c09037adfe..b58954b303ad 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.38 2010/01/23 15:46:50 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.39 2010/01/25 17:15:18 scarabeus Exp $ # @ECLASS: git.eclass # @MAINTAINER: @@ -282,7 +282,7 @@ git_fetch() { debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}" # fix branching git checkout ${EGIT_MASTER} - for x in $(git branch |grep -v "* master" |tr '\n' ' '); do + for x in $(git branch |grep -v "* ${EGIT_MASTER}" |tr '\n' ' '); do git branch -D ${x} done ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \ |