potiuk opened a new pull request, #65629:
URL: https://github.com/apache/airflow/pull/65629
Airflow's contributing docs, release runbooks, and agent instructions used
a mix of `apache`, `origin`, and placeholder names for the git remote that
tracks `apache/airflow`. This PR standardizes on **`upstream` →
`apache/airflow`**
and **`origin` → the contributor's fork** throughout — the two names already
assumed by `dev/sync_fork.sh` and by most beginner-facing docs — so that
contributors, release managers, and agents follow a single convention.
## What changed
- **Contributing docs:** new "Git remote naming conventions" section in
`contributing-docs/10_working_with_git.rst` with migration commands for
common legacy layouts (`apache` remote, `origin`-as-upstream, missing
upstream/fork). `10_working_with_git.rst` and
`18_contribution_workflow.rst`
now use `upstream` in all fetch/rebase/reset examples.
- **Release runbooks:** `dev/README_RELEASE_AIRFLOW.md`,
`README_RELEASE_AIRFLOWCTL.md`, `README_RELEASE_HELM_CHART.md`,
`README_RELEASE_PROVIDERS.md`, `README_RELEASE_PYTHON_CLIENT.md`, and
`MANUALLY_GENERATING_IMAGE_CACHE_AND_CONSTRAINTS.md` switched from
`apache` / `origin`-as-upstream to `upstream`, with a pointer to the new
conventions section.
- **Agent instructions (`AGENTS.md` / `CLAUDE.md`):** added a conventions
section and instructed agents to surface remote-name mismatches to the
user and **propose concrete `git remote rename` commands** rather than
silently going along with whatever names the checkout uses.
- **Breeze CLI defaults & messages:** `--remote-name` now defaults to
`upstream` in `release-management start-rc-process`,
`release-management update-constraints`, and
`sbom update-sbom-information`. `breeze ci find-backport-prs` warns
about a missing `upstream` (not `apache`) remote. The fallback list in
`tag_providers` tries `upstream` first and keeps `apache`/`origin` for
back-compat so existing release-manager setups keep working.
- **CI + generated artifacts:** `.github/workflows/basic-tests.yml` adds
`upstream` (not `apache`); regenerated the affected breeze help images.
## Test plan
- [x] `prek run --from-ref upstream/main --stage pre-commit` — all hooks pass
- [x] `grep` sweep confirms no `git remote add/fetch/push/pull/rebase apache`
or `apache/main` / `apache/v*-test` references remain in contributing
docs, release docs, `AGENTS.md`, or `dev/breeze/doc/`
- [x] Regenerated breeze CLI help images match the new `--remote-name`
defaults
---
##### Was generative AI tooling used to co-author this PR?
- [X] Yes — Claude Code (Opus 4.7, 1M context)
Generated-by: Claude Code (Opus 4.7, 1M context) following [the
guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#gen-ai-assisted-contributions)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
