diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-17 23:03:19 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-17 23:16:23 +0200 |
| commit | 5e7ca216a627256b161a6879d59b47cacc65eb4a (patch) | |
| tree | 1fa785525f372d251374ac940192df038d278c60 /eclass/git-2.eclass | |
| parent | e57c01ba05bbff60acb843a0c8f3cda36fab125a (diff) | |
| download | kde-5e7ca216a627256b161a6879d59b47cacc65eb4a.tar.gz kde-5e7ca216a627256b161a6879d59b47cacc65eb4a.tar.bz2 kde-5e7ca216a627256b161a6879d59b47cacc65eb4a.zip | |
[git-2] Fix variable name for submodules. Add more debug output.
Diffstat (limited to 'eclass/git-2.eclass')
| -rw-r--r-- | eclass/git-2.eclass | 4 |
1 files changed, 3 insertions, 1 deletions
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}" |