fix: Don't fail if repo has clashing branch/tag names #11127
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
Leonidas-from-XIV
requested review from
rgrinberg,
gridbugs,
maiste and
ElectreAAS
Leonidas-from-XIV
force-pushed
the
support-overlapping-branches-tags
branch
from
2a1c34e
to
8ce0fe1
Compare
gridbugs
approved these changes
Nov 18, 2024
Fixes ocaml#11113 Signed-off-by: Marek Kubica <marek@tarides.com>
Leonidas-from-XIV
force-pushed
the
support-overlapping-branches-tags
branch
from
8ce0fe1
to
305a551
Compare
maiste
reviewed
Nov 18, 2024
| Solution for dune.lock: | ||
| - foo.dev | ||
|
|
||
| If we use the duplicate reference in the condig |
There was a problem hiding this comment.
Suggested change
| If we use the duplicate reference in the condig | |
| If we use the duplicate reference in the condif |
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 duplicate ref isn't referenced then everything should just work, since we never look at it.
If the ref is referenced I opted to special case the fact of both refs pointing to the same place since then there is technically no ambiguity. In the case where they point to different places I opted to error out instead of picking one over the other. This is somewhat of an arbitrary choice as
gititself will show a warning thatrefname '$REF' is ambiguous.and then pick branches over tags (at least ingit switch) but depending on the context I don't think this is intuitive.Anyway, that be revisited but for now this PR fixes the behavior for all cases where there isn't any ambiguity.
Fixes #11113