website Changeset - 38dec75ddd5e · Conservancy Kallithea

Changeset - 38dec75ddd5e

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Ben Sturmfels (bsturmfels) - 9 months ago 2023-09-14 08:34:53
ben@sturm.com.au

fixup! Fix git merge during schedule update

1 file changed with 2 insertions and 2 deletions:

systemd/conservancy-www-update.sh

0 comments (0 inline, 0 general)

systemd/conservancy-www-update.sh

➞

Show inline comments

@@ ... / @@ -24,13 +24,13 @@ fi @@
 IFS=/ read git_remote git_refspec <<EOF
 $git_upstream
 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
     exit 0
 fi
 exitcode=0
-git merge --quiet --ff-only "$git_remote" "$git_refspec"
+git merge --quiet --ff-only "${git_remote}/${git_refspec}"
 python3 -m compileall -q -x - www || exitcode=$?
 chgrp -R www-data www || exitcode=$?
 chmod -R g+rX-w,o+X-w www || exitcode=$?

0 comments (0 inline, 0 general)