cli-jaw 2.17.22 → 2.17.23

package/scripts/promotion-checkout.sh

@@ -75,38 +75,49 @@ prepare_promotion_checkout() {
   local preview_sha="$2"
   local promotion_branch="$3"
   local checkout_dir="$4"
-  local branch_probe_status
+  local branch_probe_status remote_branch_sha
   promotion_checkout_path_safe "$checkout_dir" || return 1
   if [ ! -d "$checkout_dir" ] || [ -n "$(find "$checkout_dir" -mindepth 1 -maxdepth 1 -print -quit)" ]; then
     promotion_error "promotion checkout directory must exist and be empty: $checkout_dir"
     return 1
   fi
 
-  if git ls-remote --exit-code "$remote_url" "refs/heads/$promotion_branch" >/dev/null 2>&1; then
+  # A pre-existing remote branch is only a hazard when it points somewhere the
+  # promotion did not certify. Since #480 the promotion extends `preview`
+  # itself, so the branch is EXPECTED to exist and to be exactly the certified
+  # head — rejecting that unconditionally made the ff promotion unable to run at
+  # all. What still has to fail is a branch that resolves to any other commit:
+  # that is either leftover state from an aborted run or a head that moved while
+  # the gates ran, and building on it would publish an uncertified tree.
+  remote_branch_sha="$(git ls-remote "$remote_url" "refs/heads/$promotion_branch" 2>/dev/null | awk 'NR==1{print $1}')"
+  branch_probe_status=$?
+  if [ "$branch_probe_status" -ne 0 ]; then
+    promotion_error "could not verify remote promotion branch state: $promotion_branch"
+    return 1
+  fi
+  if [ -n "$remote_branch_sha" ] && [ "$remote_branch_sha" != "$preview_sha" ]; then
     promotion_error "remote promotion branch already exists: $promotion_branch"
     return 1
-  else
-    branch_probe_status=$?
-    if [ "$branch_probe_status" -ne 2 ]; then
-      promotion_error "could not verify remote promotion branch state: $promotion_branch"
-      return "$branch_probe_status"
-    fi
   fi
 
   git clone --quiet --no-recurse-submodules --no-checkout "$remote_url" "$checkout_dir"
-  git -C "$checkout_dir" checkout --quiet -b "$promotion_branch" "$preview_sha"
+  # -B rather than -b: the clone already carries `preview` as a local branch, so
+  # -b would abort on a name the promotion is supposed to be standing on. The
+  # start point is the certified SHA either way, and the check below proves HEAD
+  # landed there.
+  git -C "$checkout_dir" checkout --quiet -B "$promotion_branch" "$preview_sha"
   assert_promotion_checkout_initial "$checkout_dir" "$preview_sha"
 }
 
 assert_promotion_checkout_ready_to_push() {
   local checkout_dir="$1"
   local preview_sha="$2"
-  local promotion_branch="$3"
+  local target_branch="$3"
   local current_branch checkout_status commit_count
   promotion_checkout_path_safe "$checkout_dir" || return 1
   current_branch="$(git -C "$checkout_dir" branch --show-current)"
-  if [ "$current_branch" != "$promotion_branch" ]; then
-    promotion_error "promotion checkout branch is $current_branch, expected $promotion_branch"
+  if [ "$current_branch" != "$target_branch" ]; then
+    promotion_error "promotion checkout branch is $current_branch, expected $target_branch"
     return 1
   fi
   if ! git -C "$checkout_dir" merge-base --is-ancestor "$preview_sha" HEAD; then
@@ -128,52 +139,3 @@ assert_promotion_checkout_ready_to_push() {
     return 1
   fi
 }
-
-# ─── Post-promotion realignment (#466) ─────────────────────────────────────
-#
-# A squash promotion folds preview's commits into one NEW commit on main, so
-# main stops being an ancestor of preview the moment the promotion succeeds —
-# and promote-to-main.sh demands exactly that ancestry on the next cycle. The
-# script breaks its own precondition every release. Leaving the repair to prose
-# is what produced the 2.17.13 incident: a hand-made merge claimed to take the
-# preview tree, took main's, and shipped a tarball missing #418's code.
-#
-# Built from plumbing (commit-tree) rather than a worktree on purpose: the tree
-# is an INPUT here, not a merge result, so the published content cannot change
-# no matter which side is which. The caller re-checks it anyway.
-realign_branch_onto_main() {
-  local branch="$1" main_sha="$2" message="$3"
-  local head tree new_commit
-  head="$(git ls-remote origin "refs/heads/$branch" | cut -f1)"
-  if [ -z "$head" ]; then
-    echo "realign: no origin/$branch to realign" >&2
-    return 0
-  fi
-  if git merge-base --is-ancestor "$main_sha" "$head" 2>/dev/null; then
-    echo "realign: $branch already has main as an ancestor"
-    return 0
-  fi
-  git fetch origin "$branch" >/dev/null 2>&1 || true
-  tree="$(git rev-parse "$head^{tree}")" || {
-    promotion_error "realign: cannot read $branch tree"
-    return 1
-  }
-  new_commit="$(git commit-tree "$tree" -p "$head" -p "$main_sha" -m "$message")" || {
-    promotion_error "realign: could not create the realignment commit for $branch"
-    return 1
-  }
-  if [ "$(git rev-parse "$new_commit^{tree}")" != "$tree" ]; then
-    promotion_error "realign: $branch tree changed; refusing to push"
-    return 1
-  fi
-  if ! git merge-base --is-ancestor "$main_sha" "$new_commit"; then
-    promotion_error "realign: $main_sha is still not an ancestor of $branch; refusing to push"
-    return 1
-  fi
-  if git push origin "$new_commit:refs/heads/$branch" >/dev/null 2>&1; then
-    echo "realign: $branch now has main as an ancestor, tree unchanged"
-  else
-    echo "realign: could not push $branch (did it move?)" >&2
-    return 1
-  fi
-}