From cdd374c2c64f297dc38dea9d164d0a895b5e9dfc Mon Sep 17 00:00:00 2001 From: Adrian Suarez Date: Mon, 4 Sep 2023 18:18:58 -0400 Subject: [PATCH] Use origin/latest in case latest Use origin/latest when using 'git merge-base' to check if tag is on latest branch, in case it has never been checked out locally. --- scripts/update-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-release.sh b/scripts/update-release.sh index fd9922e..a743814 100755 --- a/scripts/update-release.sh +++ b/scripts/update-release.sh @@ -37,7 +37,7 @@ case "$TAG" in BRANCH_FROM="${PREFIX}.0" echo "Branch $BRANCH does not exist. Creating it off of tag $BRANCH_FROM..." # Make sure ..0 tag is on branch latest - if [ "$(git rev-parse "$BRANCH_FROM")" != "$(git merge-base latest "$BRANCH_FROM")" ]; then + if [ "$(git rev-parse "$BRANCH_FROM")" != "$(git merge-base origin/latest "$BRANCH_FROM")" ]; then fail "ERROR: Tag $BRANCH_FROM is not on branch latest" fi