From 5e7ca216a627256b161a6879d59b47cacc65eb4a Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Sun, 17 Apr 2011 23:03:19 +0200
Subject: [git-2] Fix variable name for submodules. Add more debug output.

---
 eclass/git-2.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'eclass/git-2.eclass')

diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
index 26127d56b84..3927c8b04e1 100644
--- a/eclass/git-2.eclass
+++ b/eclass/git-2.eclass
@@ -439,7 +439,7 @@ git-2_migrate_repository() {
 	local target returnstate
 
 	# first find out if we have submodules
-	if [[ -z ${EGIT_SUBMODULES} ]]; then
+	if [[ -z ${EGIT_HAS_SUBMODULES} ]]; then
 		target="bare"
 	else
 		target="full"
@@ -483,11 +483,13 @@ git-2_migrate_repository() {
 
 	# set various options to work with both options
 	if [[ ${target} == bare ]]; then
+		debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\""
 		EGIT_OPTIONS+=" --bare"
 		MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }"
 		EGIT_UPDATE_CMD="git fetch -f -u origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
 		UPSTREAM_BRANCH="${EGIT_BRANCH}"
 	else
+		debug-print "${FUNCNAME}: working in bare repository for non-bare \"${EGIT_DIR}\""
 		MOVE_COMMAND="cp -pPR ."
 		EGIT_UPDATE_CMD="git pull -f -u ${EGIT_OPTIONS}"
 		UPSTREAM_BRANCH="origin/${EGIT_BRANCH}"
-- 
cgit v1.2.3