GerhardHoffmann/UpdateController
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the copy operation for the githooks aunder .githooks.

Browse Source
This commit is contained in:
Gerhard Hoffmann 2022-06-25 21:26:20 +02:00
parent f8c091ad0c
commit 31e1aad762
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git_helpers
View File

@ -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,11 +103,6 @@ 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
# when 'git pull' is executed and changed data
# are received).
if cp ".githooks/post-merge" ".git/hooks"; then
log_debug "$func:${LINENO} copied post-merge to .git/hooks"
CLONE_CUSTOMER_REPOSITORY=true CLONE_CUSTOMER_REPOSITORY=true
log_debug "$func:${LINENO} re-init of ${1} done" log_debug "$func:${LINENO} re-init of ${1} done"
cd_home; return 0 cd_home; return 0
@ -116,7 +112,6 @@ clone_customer_repository () {
fi fi
fi fi
fi fi
fi
cd_home; return 1 cd_home; return 1
fi fi
else else