Add fast-forward PR functionality to sync-internal-release pipeline/tool#6684
Merged
Conversation
mthalman
approved these changes
Sep 26, 2025
lbussell
added a commit
to lbussell/dotnet-docker
that referenced
this pull request
Oct 9, 2025
lbussell
added a commit
that referenced
this pull request
Oct 9, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #6668. Commits should be reviewable individually.
If the internal/release/* branch is behind the release/* branch in history, then create a new branch based off of release/* and submit a pull request targeting internal/release/*.
Example pull request: https://dev.azure.com/dnceng/internal/_git/dotnet-docker-tools-internal/pullrequest/53787 [internal link]
The changeset looks larger than it actually is because I needed to split the GitRepoHelper class into LocalGitRepoHelper and RemoteGitRepoHelper. I chose to do this so that they could be mocked separately - I needed to ensure that the branch ancestry behavior works properly in a real (not mocked) git repo.
I define "remote" operations as those that reach out to the internet, even those that use a local git client instead of an API call. For example,
git fetchwould be a remote operation. This separation means we could use a real LocalGitRepoHelper and a mock RemoteGitRepoHelper at the same time in tests.A few methods needed to use both local and remote functions - those stay on GitRepoHelper.