website Changeset - d8019a11eb45 · Conservancy Kallithea

Changeset - d8019a11eb45

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Ben Sturmfels (bsturmfels) - 7 months ago 2023-09-14 08:29:08
ben@sturm.com.au

Fix git merge during schedule update

1 file changed with 2 insertions and 1 deletions:

systemd/conservancy-www-update.sh

0 comments (0 inline, 0 general)

systemd/conservancy-www-update.sh

➞

Show inline comments

@@ ... / @@ -2,6 +2,7 @@ @@
 set -e
 set -u
 set -x
 PRODUCTION_BRANCH="${PRODUCTION_BRANCH:-master}"
@@ ... / @@ -23,7 +24,7 @@ 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

0 comments (0 inline, 0 general)