`gh stack push` silently discards commits that exist only on the remote (fetch-then-lease defeats --force-with-lease)

Bắt đầu bằng cách chạy bản tái hiện hoàn toàn cục bộ được cung cấp với một bare repository, sau đó kiểm tra phần triển khai của gh stack push và so sánh với gh stack sync. Xem xét cách trạng thái stack được theo dõi trong .git/gh-stack và cách fetch cập nhật các tracking ref. Công việc được xem là hoàn tất khi các commit chỉ có trên remote được giữ lại và lệnh либо từ chối một cách an toàn hoặc báo cáo yêu cầu sync, đồng thời bản tái hiện không còn làm mất commit CI.

Summary

gh stack push fetches the stack branches and then uses the just-fetched SHA as the --force-with-lease expected value. When a stack branch on the remote contains commits the local branch does not have — for example a CI job that commits generated artifacts back onto the PR head branch — gh stack push silently rewinds the remote branch and those commits become unreachable. It exits 0 and reports ✓ Pushed N branches.

In the identical repository state, plain git push --force-with-lease refuses with ! [rejected] (stale info).

This looks like an unintended consequence of the fix for #118. That issue asked for the lease source to be the fetched tracking ref, and its safety argument covers the narrow race "someone updates b1 after the fetch". It does not cover the much more common case where the remote branch already had commits the local branch never incorporated — for those, fetch-then-lease makes the lease vacuous by construction.

Environment

• gh 2.97.0
• gh-stack v0.1.0
• git 2.39.5
• darwin/arm64

Reproduction

Fully local — uses a bare repo as origin, no GitHub access required.

#!/usr/bin/env bash
set -euo pipefail

ROOT=$(mktemp -d)
git init -q --bare -b main "$ROOT/origin.git"

# --- developer clone ---
git init -q -b main "$ROOT/work"
cd "$ROOT/work"
git config user.email dev@example.com
git config user.name dev
git config rerere.enabled true
git remote add origin "$ROOT/origin.git"
printf 'base\n' > base.txt
git add base.txt && git commit -q -m "base commit"
git push -q origin main

# --- build a two-layer stack and push it ---
gh stack init --base main layer1 >/dev/null
printf 'layer1\n' > layer1.txt && git add layer1.txt && git commit -q -m "layer1"
gh stack add layer2 >/dev/null
printf 'layer2\n' > layer2.txt && git add layer2.txt && git commit -q -m "layer2"
gh stack push >/dev/null 2>&1

# --- a CI job commits generated output back onto the remote layer1 ---
git clone -q "$ROOT/origin.git" "$ROOT/ci"
cd "$ROOT/ci"
git config user.email ci@example.com
git config user.name ci-bot
git checkout -q layer1
printf 'generated\n' > generated.txt
git add generated.txt && git commit -q -m "ci: regenerate artifacts"
git push -q origin layer1
CI_SHA=$(git rev-parse HEAD)

# --- back in the developer clone, WITHOUT fetching ---
cd "$ROOT/work"
echo "tracking ref (stale) = $(git rev-parse origin/layer1)"
echo "actual remote        = $(git ls-remote origin refs/heads/layer1 | cut -f1)"

echo "### plain git:"
git push --force-with-lease origin layer1 || true

echo "### gh stack push:"
gh stack push || true

AFTER=$(git ls-remote origin refs/heads/layer1 | cut -f1)
[ "$AFTER" = "$CI_SHA" ] && echo "CI commit preserved" || echo "CI commit LOST (remote rewound to $AFTER)"

git reflog show origin/layer1 | head -3

Observed output

tracking ref (stale) = 1f13a4980b1c0b6bd679874fdc47f6d87c2a26cb
actual remote        = 1a28a7e24b2014437d0e24d94a4489b3a6ac896f

### plain git:
 ! [rejected]        layer1 -> layer1 (stale info)
error: failed to push some refs to '.../origin.git'

### gh stack push:
Pushing 2 branches to origin...
✓ Pushed 2 branches
To create PRs for this stack, run `gh stack submit`
exit code: 0

CI commit LOST (remote rewound to 1f13a4980b1c0b6bd679874fdc47f6d87c2a26cb)

The reflog of the tracking ref shows the lease being refreshed immediately before the push:

1f13a49 refs/remotes/origin/layer1@{0}: update by push
1a28a7e refs/remotes/origin/layer1@{1}: fetch origin +refs/heads/layer1:refs/remotes/origin/layer1 +refs/heads/layer2:refs/remotes/origin/layer2: fast-forward
1f13a49 refs/remotes/origin/layer1@{2}: update by push

@{1} is gh stack push's own fetch picking up the CI commit; @{0} is the force push discarding it.

Expected behavior

gh stack push should not silently discard commits that exist only on the remote. Either:

• refuse the push and tell the user to run gh stack sync (which is already safe — it fast-forwards the local branch onto the remote first), or
• lease against the SHA gh-stack itself last pushed (it already tracks stack state in .git/gh-stack) instead of a freshly fetched value, or
• keep the current behavior behind an explicit opt-in flag.

A check along the lines of "every commit reachable from the remote ref is either reachable from the local branch or was replayed by the rebase that just ran" would cover the CI case while still allowing normal stack rebases.

Why this matters

Committing generated output back onto the PR head branch is a common CI pattern — regenerated API clients, lockfiles, schema dumps, formatting. In our repository two workflows do exactly that, so any lower layer of a stack routinely has commits that only exist on the remote. gh stack push drops them without any warning, and the layer merges with generated files that no longer match the source.

gh stack sync handles this correctly (✓ Fast-forwarded layer1 to <sha> before rebasing and pushing), so the practical workaround is to never call gh stack push on its own. The concern is that the unsafe path is the quieter one: it reports success rather than failing loudly.

Happy to test a patch if that helps.