fix(#4183): resolve root phase Fallow base (#4215)

* test(#4183): reproduce root phase Fallow base failure

* fix(#4183): resolve root phase Fallow base

Fall back to the phase root commit when its parent is unresolvable.

* chore(#4183): add release note

* chore(#4183): bind changeset to fork PR

* docs(#4183): describe root fallback precisely

* chore(#4183): bind changeset to upstream PR

---------

Co-authored-by: CI Rebase Check <ci@gsd-redux>
Co-authored-by: Tom Boucher <trekkie@nomorestars.com>
This commit is contained in:
Dennis Alexis Valin Dittrich
2026-09-05 09:32:17 +02:00
committed by GitHub
parent eedb6b5431
commit d0d542e478
3 changed files with 63 additions and 1 deletions

View File

@@ -39,7 +39,11 @@ if [ \"$FALLOW_SCOPE\" = \"phase\" ]; then
# same-numbered phases and tail -1 selected the oldest.
FALLOW_PHASE_START=$(git log --format=\"%H\" --diff-filter=A -- \"${PHASE_DIR}\" 2>/dev/null | tail -1)
if [ -n \"$FALLOW_PHASE_START\" ]; then
FALLOW_BASE=\"${FALLOW_PHASE_START}^\"
if git rev-parse \"${FALLOW_PHASE_START}^\" >/dev/null 2>&1; then
FALLOW_BASE=\"${FALLOW_PHASE_START}^\"
else
FALLOW_BASE=\"${FALLOW_PHASE_START}\"
fi
FALLOW_SCOPE_ARGS=(--changed-since \"$FALLOW_BASE\")
fi
fi