Commit 7dd83eb5 authored by Zen Fu's avatar Zen Fu
Browse files

Do not force-push from integration to gatekeeper

Due to a wrong understanding of how the Translation Platform integration
scripts work, we have previously configured force-pushes from the
integration repo into the new gatekeeper repository.

Actually, such forcing shouldn't be necessary because:

  - Gatekeeper should always be a subset of GitLab, and
  - Integration should fail early when fast-forwarding is not possible.

This commit only reverts the pushing from integration to gatekeeper to
be a normal push instead of a force-push.
parent 9ddccdb2
......@@ -26,15 +26,15 @@ git_fetch() {
)
}
git_force_push() {
git_push() {
checkout="$1"
remote="$2"
branch="$3"
log "Force-pushing ${branch} branch of '${checkout}' to the '${remote}' remote..."
log "Pushing ${branch} branch of '${checkout}' to the '${remote}' remote..."
(
cd "${checkout}"
git push --quiet ${remote} +${branch} >> "$UPDATE_LOGFILE" 2>&1
git push --quiet ${remote} ${branch} >> "$UPDATE_LOGFILE" 2>&1
log "done."
)
}
......@@ -47,7 +47,7 @@ docron() {
"${INTEGRATION_GIT_CHECKOUT}" origin/master
log "done."
git_force_push "${INTEGRATION_GIT_CHECKOUT}" weblate-gatekeeper master
git_push "${INTEGRATION_GIT_CHECKOUT}" weblate-gatekeeper master
log "Fetching and merging changes made by Weblate into the integration repo..."
git_fetch "${INTEGRATION_GIT_CHECKOUT}" weblate
......@@ -55,7 +55,7 @@ docron() {
"${INTEGRATION_GIT_CHECKOUT}" weblate/master
log "done."
git_force_push "${INTEGRATION_GIT_CHECKOUT}" weblate-gatekeeper master
git_push "${INTEGRATION_GIT_CHECKOUT}" weblate-gatekeeper master
git_fetch "${WEBLATE_GIT_CHECKOUT}" origin
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment