Add --empty=keep to backport command #15028
Merged
Conversation
This file contains 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
If the pull request being back ported contains an empty commit, the backport command will fail during `git am` since it has not been instructed what to do with an empty commit. This changes the backport command to preserve the empty commit.
jeffhandley
approved these changes
Aug 28, 2024
|
@akoeplinger since you have the most history with this, any objections to this change? |
akoeplinger
approved these changes
Aug 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
If the pull request being back ported contains an empty commit, the backport command will fail during
git amsince it has not been instructed what to do with an empty commit.This changes the backport command to preserve the empty commit.
See this pull request from
dotnet/runtimefor an example of the backport command failing in the presence of an empty commit: dotnet/runtime#106779