From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 23 Sep 2011 13:58:35 +0000 (+0000)
Subject: Ensure EGIT_LOCAL_NONBARE doesn't leak in from env.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4cec1c7ad936c0766e0447e65527c1f64da5af5f;p=gentoo.git

Ensure EGIT_LOCAL_NONBARE doesn't leak in from env.
---

diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
index a0b09f7cca87..d2a8a2e3a73e 100644
--- a/eclass/git-2.eclass
+++ b/eclass/git-2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.22 2011/09/23 13:58:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.23 2011/09/23 13:58:35 mgorny Exp $
 
 # @ECLASS: git-2.eclass
 # @MAINTAINER:
@@ -507,6 +507,7 @@ git-2_migrate_repository() {
 		MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }"
 		EGIT_UPDATE_CMD="git fetch -t -f -u origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
 		UPSTREAM_BRANCH="${EGIT_BRANCH}"
+		EGIT_LOCAL_NONBARE=
 	else
 		debug-print "${FUNCNAME}: working in bare repository for non-bare \"${EGIT_DIR}\""
 		MOVE_COMMAND="cp -pPR ."