Compare commits
1 Commits
e60f4def11
...
069127e719
| Author | SHA1 | Date | |
|---|---|---|---|
| 069127e719 |
@@ -29,6 +29,7 @@ jobs:
|
|||||||
# slugify
|
# slugify
|
||||||
image_tag="$(echo "$image_tag" | sed -E 's/[^a-zA-Z0-9]/-/g')"
|
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
|
# rebase breaks gitea.event.before, so check to make sure the hash provided exists
|
||||||
if ! git merge-base --is-ancestor $comparison_hash $branch_name >/dev/null 2>&1; then
|
if ! git merge-base --is-ancestor $comparison_hash $branch_name >/dev/null 2>&1; then
|
||||||
comparison_hash=$(git merge-base origin/$default_branch_name $branch_name)
|
comparison_hash=$(git merge-base origin/$default_branch_name $branch_name)
|
||||||
|
|||||||
Reference in New Issue
Block a user