git: on fetch, pin visible untracked remote refs #3500
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
emesterhazy
approved these changes
Apr 13, 2024
This implements the other workaround described in 57167ce "git: on import_refs(), don't abandon ancestors of newly fetched refs": > I think there are two ways to fix the problem: > a. pin non-tracking remote branches just like local refs > b. pin newly fetched refs in addition to local refs > This patch implements (b) because it's simpler and more obvious that the > fetched commits would never be abandoned immediately. The idea of (a) is that untracked remote branches are independent read-only refs, and read-only branches shouldn't be rewritten implicitly. Once the branch gets rewritten or abandoned by user, these remote refs will be hidden, and won't be pinned anymore. Since (a) effectively supersedes (b), this patch also removes the original workaround. Fixes martinvonz#3495
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.
#3495
Checklist
If applicable:
CHANGELOG.md