eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-19 04:05:36 +00:00
Code Activity

Update the variable name which stores the branch name variable

Browse Source
This commit is contained in:
Thomas Stokes
2024-03-18 15:04:27 +01:00
parent 661a18e28e
commit b26e6e966e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configuration/environments_scripts/central_reverse_proxy/files/home/httpdConf/repo.git/hooks/post-receive
+6 -6
View File
@@ -27,8 +27,8 @@ merge_main_into_branch() {
#$1 branch name. Assumes you are in the git repo.
git checkout "${1}"
git pull
echo "merging ${MAIN_NAME} into ${1}"
git merge ${MAIN_NAME}
echo "merging ${MAIN_BRANCH_NAME} into ${1}"
git merge ${MAIN_BRANCH_NAME}
git push
}
while read oldrev newrev refname; do # These vars are passed on stdin to this hook.
@@ -47,13 +47,13 @@ while read oldrev newrev refname; do # These vars are passed on stdin to this
unset GIT_DIR
cd ${CHECKED_OUT_WORKSPACE_NAME}
# get the latest main
git checkout ${MAIN_NAME}
git checkout ${MAIN_BRANCH_NAME}
git pull
# get the latest diposable branch and merge in changes
merge_main_into_branch "$DISPOSABLE_NAME"
merge_main_into_branch "$DISPOSABLE_BRANCH_NAME"
# get the latest central branch and merge in changes
merge_main_into_branch "$CENTRAL_NAME"
git checkout ${MAIN_NAME}
merge_main_into_branch "$CENTRAL_BRANCH_NAME"
git checkout ${MAIN_BRANCH_NAME}
fi
fi
done