Commit 8f2c6d7606 for bind
commit 8f2c6d76067cb3cc89d76d2fb5864e6e8c6ad0c9
Merge: 375c8f5243 afe0c653b4
Author: Michał Kępień <michal@isc.org>
Date: Tue Sep 22 11:05:50 2026 +0200
fix: ci: Report autorebase errors after merging tags back
When rebasing a security branch on top of a maintenance branch that just
had a release tag merged back into it, it may happen that the commit
determined to be the first one causing conflicts is the commit merging
the tag back. Since that commit is also the one that the script is
supposed to rebase the security branch on top of, the "git log"
invocation that attempts to determine the first conflicting merge
request returns an empty string (because ${CONFLICT_COMMIT} and
${BASE_COMMIT} are the same commit hash), breaking the logic in the rest
of "after_script" in a way that prevents an autorebase error from being
reported via Zulip. Handle this scenario gracefully, so that it gets
reported like any other autorebase failure.
Merge branch 'michal/report-autorebase-errors-after-merging-tags-back' into 'main'
See merge request isc-projects/bind9!12768