Fix the squash-commit idempotency check to resolve in real action runs

has_squash_commit compared the target with a bare branch name like "main".
actions/checkout leaves a detached HEAD and creates no local branches, so
"main" does not resolve and git exits 128, which the if silently reads as
"not up-to-date". The skip branch was therefore dead in CI and only worked
in tests, where the test repos have every branch locally.

This matters on the resume path: the push that finishes conflict resolution
fires a synchronize event while the conflict label is still on. If that
second run loses the race against the label removal, the broken check let it
re-run the whole merge and push a second redundant synthetic merge commit.

Compare against origin/$TARGET_BRANCH instead. With fetch-depth: 0 the
remote-tracking ref always exists, so the check works in production while
staying correct in tests.

Author: claude

update-pr-stack.sh

@@ -65,8 +65,11 @@ check_env_var() {
 # Check if a branch already has the squash commit merged (squash-merge mode only)
 # Requires SQUASH_COMMIT ref to be set via git update-ref
 #
-# Note: This uses local branch refs. The caller must ensure both branches
-# exist locally before calling (e.g., via git checkout).
+# BASE must be a ref that resolves in a real action run: actions/checkout leaves
+# a detached HEAD with no local branches, so a bare name like "main" does not
+# exist and git fails with exit 128 (silently read as "not an ancestor"). Pass
+# the remote-tracking ref (origin/$TARGET_BRANCH); fetch-depth: 0 guarantees it
+# is present. BRANCH is the locally checked-out head being updated.
 has_squash_commit() {
     local BRANCH="$1"
     local BASE="$2"
@@ -79,11 +82,11 @@ update_direct_target() {
     local BASE_BRANCH="$2"
 
     # Checkout first to ensure the local branch exists (created from origin if
-    # needed). This allows has_squash_commit to compare local refs, which matters
-    # for testing where the script may run multiple times in the same repo.
+    # needed) so has_squash_commit and the merge below operate on it. The target
+    # is compared via its remote-tracking ref, which always exists.
     log_cmd git checkout "$BRANCH"
 
-    if has_squash_commit "$BRANCH" "$TARGET_BRANCH"; then
+    if has_squash_commit "$BRANCH" "origin/$TARGET_BRANCH"; then
         echo "✓ $BRANCH already up-to-date; skipping"
         return 0
     fi