Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix git merge during schedule update

Browse source
This commit is contained in:
Ben Sturmfels 2023-09-14 18:29:08 +10:00
parent 3c79fa50b5
commit d8019a11eb
Signed by: bsturmfels
GPG key ID: 023C05E2C9C068F0
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
systemd/conservancy-www-update.sh
View file

@ -2,6 +2,7 @@
set -e set -e
set -u set -u
set -x
PRODUCTION_BRANCH="${PRODUCTION_BRANCH:-master}" PRODUCTION_BRANCH="${PRODUCTION_BRANCH:-master}"
@ -23,7 +24,7 @@ fi
IFS=/ read git_remote git_refspec <<EOF IFS=/ read git_remote git_refspec <<EOF
$git_upstream $git_upstream
EOF EOF
git fetch --quiet --no-tags "$git_remote" "$git_refspec" git fetch --quiet --no-tags "${git_remote}/${git_refspec}"
if [ "$(git rev-parse "$PRODUCTION_BRANCH")" = "$(git rev-parse "$git_upstream")" ]; then if [ "$(git rev-parse "$PRODUCTION_BRANCH")" = "$(git rev-parse "$git_upstream")" ]; then
exit 0 exit 0
fi fi