diff --git a/git_helpers b/git_helpers index 19bbf74..8f2531a 100755 --- a/git_helpers +++ b/git_helpers @@ -81,12 +81,14 @@ clone_customer_repository () { $(exec_git_command git clone "$1") if [ $? -eq 0 ]; then log_debug "$func:${LINENO} cloning ${1} done" + GIT_CLONE_EXECUTED=1 # after cloning, cd into repository, and re-initialize, # setting the work-tree as "/". This has the effect that # a "git pull" will automatically fetched files in the # corresponding sytem-folders. if cd ${CUSTOMER_ID_BASE_DIR}; then # local res=$(exec_git_command git --git-dir=.git --work-tree=/ init) + exec_git_command git checkout "$LOCAL_BRANCH" exec_git_command git config core.worktree "/" if [[ $? -eq 0 ]]; then # re-initialized. copy post-merge (a hook called