Removed the copy operation for the githooks aunder .githooks.
This commit is contained in:
parent
f8c091ad0c
commit
31e1aad762
21
git_helpers
21
git_helpers
@ -89,7 +89,8 @@ clone_customer_repository () {
|
|||||||
# a "git pull" will automatically fetched files in the
|
# a "git pull" will automatically fetched files in the
|
||||||
# corresponding sytem-folders.
|
# corresponding sytem-folders.
|
||||||
if cd ${CUSTOMER_ID_BASE_DIR}; then
|
if cd ${CUSTOMER_ID_BASE_DIR}; then
|
||||||
# local res=$(exec_git_command git --git-dir=.git --work-tree=/ init)
|
# configure hooks directory
|
||||||
|
exec_git_command git config core.hooksPath .githooks
|
||||||
exec_git_command git checkout "$LOCAL_BRANCH"
|
exec_git_command git checkout "$LOCAL_BRANCH"
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
log_debug "$func:${LINENO} checked out local branch $LOCAL_BRANCH"
|
log_debug "$func:${LINENO} checked out local branch $LOCAL_BRANCH"
|
||||||
@ -102,19 +103,13 @@ clone_customer_repository () {
|
|||||||
exec_git_command git reset --hard "$LOCAL_BRANCH"
|
exec_git_command git reset --hard "$LOCAL_BRANCH"
|
||||||
if [[ $? -eq 0 ]]; then
|
if [[ $? -eq 0 ]]; then
|
||||||
log_debug "$func:${LINENO} reset --hard $LOCAL_BRANCH"
|
log_debug "$func:${LINENO} reset --hard $LOCAL_BRANCH"
|
||||||
# re-initialized. copy post-merge (a hook called
|
CLONE_CUSTOMER_REPOSITORY=true
|
||||||
# when 'git pull' is executed and changed data
|
log_debug "$func:${LINENO} re-init of ${1} done"
|
||||||
# are received).
|
cd_home; return 0
|
||||||
if cp ".githooks/post-merge" ".git/hooks"; then
|
fi
|
||||||
log_debug "$func:${LINENO} copied post-merge to .git/hooks"
|
fi
|
||||||
CLONE_CUSTOMER_REPOSITORY=true
|
|
||||||
log_debug "$func:${LINENO} re-init of ${1} done"
|
|
||||||
cd_home; return 0
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
cd_home; return 1
|
cd_home; return 1
|
||||||
|
Loading…
Reference in New Issue
Block a user