Skip to content

ci: force-update the base ref in change detection - #6463

Merged
Hmbown merged 2 commits into
mainfrom
ci/change-detection-forced-base-fetch
Sep 24, 2026
Merged

Hmbown merged 2 commits into
mainfrom
ci/change-detection-forced-base-fetch

Conversation

@Hmbown

@Hmbown Hmbown commented Sep 24, 2026

Copy link
Copy Markdown
Owner

Refs #6458

Change detection on #6417 failed with ! [rejected] main -> origin/main (non-fast-forward). The sequence:

  1. Checkout had already fetched origin/main.
  2. main then moved, when fix(fleet): publish without a two-link window on Linux and macOS #6431 merged.
  3. The --depth=1 base fetch couldn't prove the new tip descends from the old one, so git refused the update.

The ref is only a scratch diff base, so a forced update (+refspec) is always correct.

Verification: actionlint with CI's flags is clean.

🤖 Generated with Claude Code

Change detection on #6417 failed with
`! [rejected] main -> origin/main (non-fast-forward)`: main moved (the
#6431 merge) after checkout had fetched origin/main, and the --depth=1
fetch cannot prove the new tip descends from the old one. The ref is a
scratch remote-tracking ref for the diff base, so a forced update is
always right.

Verification: actionlint with CI's flags clean.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Copilot AI lite review requested due to automatic review settings September 24, 2026 00:53

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@Hmbown
Hmbown merged commit 49c56f2 into main Sep 24, 2026
31 checks passed
@Hmbown
Hmbown deleted the ci/change-detection-forced-base-fetch branch September 24, 2026 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants