Compare commits
1 Commits
6794966fff
...
c3bf7ff49f
| Author | SHA1 | Date | |
|---|---|---|---|
| c3bf7ff49f |
@@ -28,7 +28,7 @@ jobs:
|
||||
image_tag="$(echo "$image_tag" | sed -E 's/[^a-zA-Z0-9]/-/g')"
|
||||
|
||||
# rebase breaks gitea.event.before, so check to make sure the hash provided exists
|
||||
if ! git merge-base --is-ancestor $comparison_hash $branch_name; then
|
||||
if ! git merge-base --is-ancestor $comparison_hash origin/$branch_name >/dev/null 2>&1; then
|
||||
comparison_hash=$(git merge-base ${{ gitea.event.repository.default_branch }} $branch_name)
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user