Skip to content

Add Contributed backport command #22643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jan 31, 2023
Merged

Add Contributed backport command #22643

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cdc926a
Add Contributed backport command
zeripath Jan 28, 2023
42444d3
Merge branch 'main' into add-backport-contrib-command
lafriks Jan 28, 2023
c562dca
Update contrib/backport/README
zeripath Jan 28, 2023
a391851
fix bug
zeripath Jan 28, 2023
314bdc9
Merge remote-tracking branch 'zeripath/add-backport-contrib-command' …
zeripath Jan 28, 2023
76083f3
local-remote releasebranches
zeripath Jan 28, 2023
2794956
clarify variable names
zeripath Jan 28, 2023
800c1e0
use-yaml.v3
zeripath Jan 28, 2023
f58b9b9
minor adjustments
zeripath Jan 28, 2023
99d6bc0
more minor changes
zeripath Jan 28, 2023
e03872b
clarify release branch
zeripath Jan 28, 2023
1800dac
more readme changes
zeripath Jan 28, 2023
f4bd4ba
no-amend-message instead
zeripath Jan 28, 2023
5d30140
Merge branch 'main' into add-backport-contrib-command
lunny Jan 29, 2023
26f7748
Update contrib/backport/README
zeripath Jan 31, 2023
344908b
Merge branch 'main' into add-backport-contrib-command
zeripath Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions contrib/backport/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ be overrided using `--upstream`, and fetching can be avoided using
By default the branch created will be called `backport-$PR-$VERSION`. You
can override this using the option `--backport-branch`. This branch will
be created from `--release-branch` which is `release/$(VERSION)`
by default which will be pulled from `$(UPSTREAM)`.
by default and will be pulled from `$(UPSTREAM)`.

The merge-commit as determined by the github API will be used as the SHA to
cherry-pick. You can override this using `--cherry-pick`.

The commit will be amended to add the `Backport` header. `--no-amend` can
be set to stop this.
The commit meesage will be amended to add the `Backport` header. `--no-amend`
can be set to stop this from happening.

If cherry-pick is successful the backported branch will be pushed up to your
fork using your remote. These will be determined using `git remote -v`. You
Expand Down