From: Michał Kępień Date: Thu, 30 Apr 2026 20:34:55 +0000 (+0200) Subject: fix: ci: Use "git push --force-with-lease" for autorebases X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c66f1a2418ae93c454b07c03b2aef3a97e925cd;p=thirdparty%2Fbind9.git fix: ci: Use "git push --force-with-lease" for autorebases If a merge request is merged to an autorebased branch while it is getting rebased, the "git push -f" command at the end of the autorebase job will cause the contents of that merge request to be silently deleted from Git history even though the merge request will still be (correctly) shown as "merged" by GitLab. Use "git push --force-with-lease" instead to prevent force-pushing the rebased version of the branch if it is pushed to after its pre-rebase version is fetched by the autorebase job. Report such an event accordingly. For simplicity, no retries are attempted as the problem is expected to be resolved by the next autorebase and the chances of this scenario happening in practice are already low to begin with. Merge branch 'michal/use-git-push-force-with-lease-for-autorebases' into 'main' See merge request isc-projects/bind9!11939 --- 5c66f1a2418ae93c454b07c03b2aef3a97e925cd