Allow branches on the root commit again #2206
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
Before this patch, the order would depend on the reason we failed to export a ref, because we would add to the `failed_branches` list in several different places. What's worse, when the export failed because the branch was conflicted or had an invalid name (from Git's perspective), it was non-deterministic because we iterated over a HashSet. This patch fixes that by sorting at the end. Note that we still want the `branches_to_update` map to be a `BTreeMap` so we update branches in deterministic order. Otherwise the error when trying to export both branches `main` and `main/sub` will become non-deterministic.
Many failure to export refs to Git are not about conflicts between a branch named `foo` and a branch named `foo/bar`, so don't give that hint in most cases.
Git doesn't have a root commit, so we should skip branches pointing to it on export, just like we do with conflicted branches (which Git also doesn't support).
martinvonz
force-pushed
the
push-lvtyzuxnrkrm
branch
from
169593e to
b9a0729
Compare
|
Cc #1529 |
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.
Checklist
If applicable:
CHANGELOG.md