Gnous/main_website
2
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Activity

Update post-receive hook to avoid unwanted merge

Browse Source
This commit is contained in:
thopic 2023-07-04 17:54:52 +02:00
parent d1cc5fcb25
commit 0b79ea838c
Signed by: thopic
GPG Key ID: 292DBBF0B54AD4C5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -19,10 +19,16 @@ do
# only checking out the master (or whatever branch you would like to deploy) # only checking out the master (or whatever branch you would like to deploy)
if [ "$ref" = "refs/heads/master" ]; if [ "$ref" = "refs/heads/master" ];
then then
echo "Ref $ref received. Deploying master branch to production..."
cd $TARGET cd $TARGET
unset GIT_DIR unset GIT_DIR
git pull --ff-only $REMOTE master PROD_BR=`git rev-parse --abbrev-ref HEAD`
if [ $PROD_BR != "master" ];
then
echo "Production repo is on $PROD_BR branch. Aborting..."
else
echo "Ref $ref (${newrev:0:7}) received. Deploying master branch to production..."
git pull --ff-only $REMOTE master
fi
else else
echo "Ref $ref received. Doing nothing: only the master branch may be deployed on this server." echo "Ref $ref received. Doing nothing: only the master branch may be deployed on this server."
fi fi