See the man page for a description of what this does.
Details
Details
Diff Detail
Diff Detail
- Repository
- rG FreeBSD src repository
- Lint
Lint Skipped - Unit
Tests Skipped - Build Status
Buildable 74313 Build 71196: arc lint + arc unit
Event Timeline
Comment Actions
Dag-Erling points out that this script ignores reverts. In particular, we should warn if a user tries to MFC a reverted commit, and it shouldn't MFC fixup commits that were reverted.
It would probably also be useful to search for MFC candidates, i.e., commits from the origin branch which have (expired) MFC tags but aren't in the current branch.
Comment Actions
Lots of changes:
- add a man page
- add a --pending option to look for commits which are awaiting MFC
- take reverts into account when scanning commits
- lots of minor changes
| tools/tools/git/git-mfc | ||
|---|---|---|
| 233 | Sequences of related commits are frequently squashed on MFC, and this will only match the last of the series. See for instance 4a866919c37b, 736c14784574. | |
| tools/tools/git/git-mfc.1 | ||
| 289 | No AUTHORS section? | |
Comment Actions
Review feedback:
- Don't assume that a given stable/* commit corresponds to a single upstream commit.
- Pick the default remote based on the upstream of the currently checked-out branch.
- Add an AUTHORS section to the man page.
Comment Actions
Make git-mfc skip already-MFCed commits by default. This makes handling
of conflicts more ergonomic: after resolving a conflict, you run git cherry-pick --continue
to finish the current cherry-pick, then run the original git mfc command to resume.
Add a --force option to make git-mfc try to cherry-pick commits that it thinks have already
been cherry-picked.