Skip to content

Commit f958c6f

Browse files
committed
fix: 🐛 correct remote branch reference in merge-base check
1 parent caf9319 commit f958c6f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/gitutils/_git-release-prod.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if ! git fetch $(git remote) >/dev/null 2>&1; then
5555
fi
5656

5757
# Ensure main branch is up-to-date
58-
if ! git merge-base --is-ancestor $(git rev-parse $flow/$name) $(git rev-parse $(git symbolic-ref refs/remotes/$(git remote)/$flow/$name)) ; then
58+
if ! git merge-base --is-ancestor $(git rev-parse $flow/$name) $(git rev-parse refs/remotes/$(git remote)/$flow/$name) ; then
5959
zz_log e "$flow/$name branch is not up-to-date with remote. Please pull the latest changes."
6060
exit 1
6161
fi

0 commit comments

Comments
 (0)